Skip to content

S
shareConfig
Commit 58bad23b by 无尘
Options

fix: 修改bug

parent 97a2fbca
Showing with 38 additions and 62 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.258c9f21fa54d27915320276eaabd9ec.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.bc5a6fc53a685d08f9e7.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.a8e800cff26016deb0e0.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.9c32be6200481d898a7fff7c8561d4ec.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.401042331d81e1688402.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.a8e800cff26016deb0e0.js></script></body></html>
\ No newline at end of file
dist/static/js/2.3946300399ed574c7c3a.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.d056f7ee86e7e4ad2771.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/manifest.bc5a6fc53a685d08f9e7.js → dist/static/js/manifest.401042331d81e1688402.js
!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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"d056f7ee86e7e4ad2771",3:"55e8efc288475f3370b6",4:"58b2cdc934ac0602da21",5:"5118ceae8c49297e4615",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[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:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"3946300399ed574c7c3a",3:"55e8efc288475f3370b6",4:"82880deac7b9e730bae7",5:"5118ceae8c49297e4615",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[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/invitee-reward.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:29:16
* @LastEditTime: 2019-12-16 09:44:30
-->
<!--
<invitee-reward></invitee-reward>
......@@ -115,7 +115,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
<span class="font-14 color-606266 p-r-10">满</span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="scope.row.amount"
v-model="scope.row.achieve"
controls-position="right"
:step="1"
:step-strictly="true"
......@@ -284,7 +284,7 @@ import inviteeReward from '@/components/active-config/configs/invitee-reward.vue
<span class="font-14 color-606266 p-r-10">满</span>
<el-input-number
:disabled="$route.query.editFlag"
v-model="scope.row.amount"
v-model="scope.row.achieve"
controls-position="right"
:step="1"
:step-strictly="true"
......@@ -354,7 +354,7 @@ export default {
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
achieve: 1,
point: 1
}
],
......@@ -365,7 +365,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -386,7 +386,7 @@ export default {
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
achieve: 1,
point: 1
}
],
......@@ -397,7 +397,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -432,7 +432,7 @@ export default {
if (that.invitedAward.pointSettingFlag && that.invitedAward.pointAwardMode == 2 && that.invitedAward.pointAwardStepParam.length) {
let flag = true;
that.invitedAward.pointAwardStepParam.forEach(ele => {
if (!ele.amount || !ele.point) {
if (!ele.achieve || !ele.point) {
flag = false;
}
});
......@@ -444,7 +444,7 @@ export default {
let flag = true
const arr = [];
that.invitedAward.pointAwardStepParam.forEach(ele => {
arr.push(ele.amount);
arr.push(ele.achieve);
});
for(let i = 0; i<arr.length-1; i++) {
......@@ -471,7 +471,7 @@ export default {
if (that.invitedAward.cardSettingFlag && that.invitedAward.cardAwardMode == 2 && that.invitedAward.cardAwardStepParam.length) {
let flag = true;
that.invitedAward.cardAwardStepParam.forEach(ele => {
if (!ele.amount||!ele.cardId) {
if (!ele.achieve||!ele.cardId) {
flag = false;
}
});
......@@ -483,7 +483,7 @@ export default {
let flag = true
const arr = [];
that.invitedAward.cardAwardStepParam.forEach(ele => {
arr.push(ele.amount);
arr.push(ele.achieve);
if (!ele.cardId) {
flag = false;
}
......@@ -529,7 +529,7 @@ export default {
return false;
}
that.invitedAward.pointAwardStepParam.push({
amount: 1,
achieve: 1,
point: 1
});
},
......@@ -539,7 +539,7 @@ export default {
return false;
}
that.invitedAward.cardAwardStepParam.push({
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
});
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-14 14:46:57
* @LastEditTime: 2019-12-16 09:46:12
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -447,10 +447,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -459,7 +456,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -536,10 +533,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -548,7 +542,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -685,10 +679,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -697,7 +688,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -789,10 +780,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -801,7 +789,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -911,10 +899,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -923,7 +908,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -1015,10 +1000,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -1027,7 +1009,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -1119,10 +1101,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -1131,7 +1110,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......@@ -1223,10 +1202,7 @@ export default {
pointAwardMode: 1, //1、定额，2、阶梯，3、等比
pointAwardPoint: 1, //定额奖励积分
pointAwardStepParam: [
{
amount: 1,
point: 1
}
],
pointAwardPerAmount: 1, //等比奖励中的每成交多少元
pointAwardPerPoint: 1, //等比奖励中积分
......@@ -1235,7 +1211,7 @@ export default {
cardName: '',
cardAwardStepParam: [
{
amount: 1,
achieve: 1,
cardId: '',
cardName: ''
}
......
src/components/data-details/card-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 14:57:20
* @LastEditTime: 2019-12-16 09:37:10
-->
<!--
<card-log></card-log>
......@@ -41,7 +41,7 @@ import cardLog from '@/components/data-details/card-log.vue';
<template slot-scope="scope">
<div class="cell">
<div>
<span v-if="scope.row.awardProgram == 1">即时奖励</span>
<span v-if="scope.row.awardProgram == 1">即时奖励{{scope.row.awardStatus == 2? '（退款追扣）' : ''}}</span>
<span v-if="scope.row.awardProgram == 2">闯关奖励</span>
<span v-if="scope.row.awardProgram == 3">{{scope.row.competitionName}}</span>
</div>
......
src/components/data-details/point-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 15:10:50
* @LastEditTime: 2019-12-16 09:37:03
-->
<!--
<point-log></point-log>
......@@ -40,7 +40,7 @@ import pointLog from '@/components/data-details/point-log.vue';
<template slot-scope="scope">
<div class="cell">
<div>
<span v-if="scope.row.awardProgram == 1">即时奖励</span>
<span v-if="scope.row.awardProgram == 1">即时奖励{{scope.row.awardStatus == 2? '（退款追扣）' : ''}}</span>
<span v-if="scope.row.awardProgram == 2">闯关奖励</span>
<span v-if="scope.row.awardProgram == 3">{{scope.row.competitionName}}</span>
</div>
......
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