Skip to content

S
shareConfig
Commit 987ff5c9 by 无尘
Options

fix: 修改卡券数据

parent 67d973ae
Showing with 79 additions and 22 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.42c639d2cd2f1064be821c0d342890d4.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.3596070ac849387aef65.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.d3f5ffebdf103b038439cab4bf9b917c.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.a71a7b8b0ac6b2697095.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.0fb9cd8d424666a76e5e.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/2.9d45ca58c2c02f6efb84.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.3596070ac849387aef65.js → dist/static/js/manifest.a71a7b8b0ac6b2697095.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:"0fb9cd8d424666a76e5e",3:"3d84ff0fa66ed098569e",4:"366114bdae61c66a2455",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,f){for(var a,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"9d45ca58c2c02f6efb84",3:"3d84ff0fa66ed098569e",4:"ad5448f66bd832ae9fc4",5:"5118ceae8c49297e4615",6:"f11d902de0350ef6b333",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"79c83b22c308f0e0e879",12:"3c0d12e65df907bcbcc5"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),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/poster-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-14 14:44:37
* @LastEditTime: 2019-12-15 14:39:32
-->
<!--
<poster-config @submitBack="submitBack" @submitNext="submitNext"></poster-config>
......@@ -139,8 +139,10 @@ import posterConfig from '@/components/active-config/poster-config.vue';
v-model="activeInfoData.qrcodePadding"
controls-position="right"
@change="changePadding"
:step="1"
:step-strictly="true"
:min="1"
:max="60"
:max="40"
></el-input-number>
</div>
</div>
......
src/components/data-details/card-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-11-15 11:46:16
* @LastEditTime: 2019-12-15 14:57:20
-->
<!--
<card-log></card-log>
......@@ -13,8 +13,18 @@ import cardLog from '@/components/data-details/card-log.vue';
-->
<template>
<div class="card-log">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column prop="" label="奖励时间" show-overflow-tooltip>
<el-table
class="select-table"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
:style="{ width: '100%', minHeight: tableH }"
>
<el-table-column
prop=""
label="奖励时间"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div>{{ scope.row.awardTime | timeStampToYmd }}</div>
......@@ -23,31 +33,58 @@ import cardLog from '@/components/data-details/card-log.vue';
</template>
</el-table-column>
<el-table-column prop="" label="奖励来源" show-overflow-tooltip>
<el-table-column
prop=""
label="奖励来源"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div>
<span v-if="scope.row.awardProgram == 1">即时奖励</span>
<span v-if="scope.row.awardProgram == 2">闯关奖励</span>
<span v-if="scope.row.awardProgram == 3">竞赛奖励</span>
<span v-if="scope.row.awardProgram == 3">{{scope.row.competitionName}}</span>
</div>
<div>{{scope.row.awardProgram == 1 || scope.row.awardProgram == 2 ? scope.row.awardDetail : scope.row.competitionName }}</div>
<div v-if="scope.row.awardProgram == 1">{{stepObj[scope.row.transType]}}</div>
<div v-if="scope.row.awardProgram == 2 || scope.row.awardProgram == 3">{{scope.row.awardDetail }}</div>
</div>
</template>
</el-table-column>
<el-table-column label="受邀人信息" show-overflow-tooltip>
<el-table-column
label="受邀人信息"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell flex flex-align-center">
<img :src="scope.row.headUrl" alt="" /><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
<img
:src="scope.row.headUrl"
alt=""
/><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
</div>
</template>
</el-table-column>
<el-table-column prop="" label="奖励内容" show-overflow-tooltip>
<el-table-column
prop=""
label="奖励内容"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.awardCardName || '--' }}</template>
</el-table-column>
</el-table>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </el-pagination>
<div
class="block common-wrap__page text-right m-t-24"
v-if="tableData.length != 0"
>
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
> </el-pagination>
</div>
</div>
</template>
......@@ -62,7 +99,16 @@ export default {
tableData: [],
currentPage: 1,
pageSize: 20,
total: 0
total: 0,
stepObj: {
'1': '服务号关注',// 1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
'2': '访问活动营销页',
'3': '会员认证',
'4': '游戏参与',
'5': '卡券领取',
'6': '消费'
},
};
},
methods: {
......
src/components/data-details/point-log.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 19:24:36
* @LastEditTime: 2019-12-15 14:55:33
-->
<!--
<point-log></point-log>
......@@ -42,9 +42,11 @@ import pointLog from '@/components/data-details/point-log.vue';
<div>
<span v-if="scope.row.awardProgram == 1">即时奖励</span>
<span v-if="scope.row.awardProgram == 2">闯关奖励</span>
<span v-if="scope.row.awardProgram == 3">竞赛奖励</span>
<span v-if="scope.row.awardProgram == 3">{{scope.row.competitionName}}</span>
</div>
<div>{{scope.row.awardProgram == 1 || scope.row.awardProgram == 2 ? scope.row.awardDetail : scope.row.competitionName }}</div>
<div v-if="scope.row.awardProgram == 1">{{stepObj[scope.row.transType]}}</div>
<div v-if="scope.row.awardProgram == 2 || scope.row.awardProgram == 3">{{scope.row.awardDetail }}</div>
</div>
</template>
</el-table-column>
......@@ -98,7 +100,14 @@ export default {
currentPage: 1,
pageSize: 20,
total: 0,
stepObj: {
'1': '服务号关注',// 1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
'2': '访问活动营销页',
'3': '会员认证',
'4': '游戏参与',
'5': '卡券领取',
'6': '消费'
},
};
},
methods: {
......
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