Skip to content

S
shareConfig
Commit 2f640bf4 by 无尘
Options

fix: 修改配置

parent ede88809
Showing with 115 additions and 64 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.50a25538371693ff99cebc4508d7a124.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.67b1c04d218dacaf1611.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.67bf41e260696155ccbd.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.8d67465c71e7792ed673fe3fd9282e42.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.6f8468e3cbd1247c2038.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/css/app.50a25538371693ff99cebc4508d7a124.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.8d67465c71e7792ed673fe3fd9282e42.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.3c0d12e65df907bcbcc5.js → dist/static/js/11.c11d02c33702d00b2e2e.js
webpackJsonp([12],{YPWR:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=n("5reh"),i={name:"App",data:function(){return{projectName:"share-config",contentHeight:"0px",collapseFlag:!1,leftModulesName:""}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},watch:{},mounted:function(){this.$store.commit(o.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},s={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{minHeight:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var a=n("VU/8")(i,s,!1,function(t){n("nVgj")},null,null);e.default=a.exports},nVgj:function(t,e){}}); webpackJsonp([11],{YPWR:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var o=n("5reh"),i={name:"App",data:function(){return{projectName:"share-config",contentHeight:"0px",collapseFlag:!1,leftModulesName:""}},methods:{toRouterView:function(t){this.$router.push({path:t.path})},collapseTag:function(t){this.collapseFlag=t}},watch:{},mounted:function(){this.$store.commit(o.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},s={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{minHeight:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var a=n("VU/8")(i,s,!1,function(t){n("nVgj")},null,null);e.default=a.exports},nVgj:function(t,e){}});
\ No newline at end of file \ No newline at end of file
dist/static/js/11.e7b68ef7d74febb1eca1.js deleted 100644 → 0
webpackJsonp([11],{dStO:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=a("3Xzz"),r=a("P9l9"),n=a("Ch4/"),o={name:"invited-log",components:{navCrumb:i.a},data:function(){return{navpath:[{name:"分享有礼",path:"/shareIndex"},{name:"受邀人日志"}],invitedData:{headUrl:"",realName:""},tableData:[],currentPage:1,pageSize:20,total:0}},methods:{handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getInvitedData:function(){var t=this,e={activityId:t.$route.query.activityId,openId:t.$route.query.invitedId};Object(r.a)("/sharing-core-web/get-activity-invited",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.invitedData=a.result||{headUrl:"",realName:""},!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},getTableList:function(){var t=this,e={openId:t.$route.query.invitedId,activityId:t.$route.query.activityId};Object(r.a)("/sharing-core-web/list-activity-invited-trans",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result||[],!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getInvitedData(),this.getTableList()}},s={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invited-log common-wrap"},[a("nav-crumb",{attrs:{navpath:t.navpath}}),t._v(" "),a("div",{staticClass:"right-content border-box"},[a("div",{staticClass:"right-box border-box"},[a("div",{staticClass:"invited-data"},[a("div",{staticClass:"invited-data-img flex flex-align-center flex-pack-center"},[a("img",{attrs:{src:t.invitedData.headUrl,alt:""}})]),t._v(" "),a("div",{staticClass:"invited-data-name text-center font-14 color-606266"},[t._v("-"+t._s(t.invitedData.realName)+"-")])]),t._v(" "),a("div",{staticClass:"invited-log-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"}},[a("el-table-column",{attrs:{prop:"",label:"操作时间","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.transTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.transTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"转化进度","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.transName||"--"))]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"详情","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.orderNo?"订单编号：":"")+t._s(e.row.orderNo||"--"))]}}])})],1)],1)])]),t._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var l=a("VU/8")(o,s,!1,function(t){a("ph82")},"data-v-94d7bf88",null);e.default=l.exports},ph82:function(t,e){}});
\ No newline at end of file
dist/static/js/12.cb13b689aaa548c4bc33.js 0 → 100644
webpackJsonp([12],{"5ATK":function(t,e){},dStO:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=a("3Xzz"),r=a("P9l9"),n=a("Ch4/"),o={name:"invited-log",components:{navCrumb:i.a},data:function(){return{navpath:[{name:"分享有礼",path:"/shareIndex"},{name:"受邀人日志"}],invitedData:{headUrl:"",realName:""},tableData:[],currentPage:1,pageSize:20,total:0}},methods:{handleSizeChange:function(t){this.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.currentPage=t,this.getTableList()},getInvitedData:function(){var t=this,e={activityId:t.$route.query.activityId,openId:t.$route.query.invitedId};Object(r.a)("/sharing-core-web/get-activity-invited",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.invitedData=a.result||{headUrl:"",realName:""},!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})},getTableList:function(){var t=this,e={openId:t.$route.query.invitedId,activityId:t.$route.query.activityId};Object(r.a)("/sharing-core-web/list-activity-invited-trans",e).then(function(e){var a=e.data;if(1==a.errorCode)return t.tableData=a.result||[],!1;n.a.errorMsg(a)}).catch(function(e){t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getInvitedData(),this.getTableList()}},s={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"invited-log common-wrap"},[a("nav-crumb",{attrs:{navpath:t.navpath}}),t._v(" "),a("div",{staticClass:"right-content border-box"},[a("div",{staticClass:"right-box border-box"},[a("div",{staticClass:"invited-data"},[a("div",{staticClass:"invited-data-img flex flex-align-center flex-pack-center"},[a("img",{attrs:{src:t.invitedData.headUrl,alt:""}})]),t._v(" "),a("div",{staticClass:"invited-data-name text-center font-14 color-606266"},[t._v("-"+t._s(t.invitedData.realName)+"-")])]),t._v(" "),a("div",{staticClass:"invited-log-table"},[a("el-table",{ref:"multipleTable",staticClass:"select-table",style:{width:"100%"},attrs:{data:t.tableData,"tooltip-effect":"dark"}},[a("el-table-column",{attrs:{prop:"",label:"操作时间","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"cell"},[a("div",[t._v(t._s(t._f("timeStampToYmd")(e.row.transTime)))]),t._v(" "),a("div",[t._v(t._s(t._f("timeStampToHms")(e.row.transTime)))])])]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"转化进度","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.transName||"--"))]}}])}),t._v(" "),a("el-table-column",{attrs:{prop:"",label:"详情","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v(t._s(e.row.orderNo?"订单编号：":"")+t._s(e.row.orderNo||"--"))]}}])})],1)],1)])]),t._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var l=a("VU/8")(o,s,!1,function(t){a("5ATK")},"data-v-659bda01",null);e.default=l.exports}});
\ No newline at end of file
dist/static/js/2.2160f0e318303298c871.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.377fd9be43a43725324d.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.67b1c04d218dacaf1611.js → dist/static/js/manifest.6f8468e3cbd1247c2038.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:"b1c6d8cabf2459ac5a8a",1:"5b546fa38466a0b05e37",2:"377fd9be43a43725324d",3:"67aed138d1894c8cdaa3",4:"6b43742dfc7cb51110f4",5:"abff12af4617fd95b302",6:"cfe9b80ab51704b08fb2",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"e7b68ef7d74febb1eca1",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}}([]); !function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var f,i,u,b=0,d=[];b<r.length;b++)i=r[b],t[i]&&d.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);d.length;)d.shift()();if(a)for(b=0;b<a.length;b++)u=o(o.s=a[b]);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:"a6710db96e29b9dc1718",1:"5b546fa38466a0b05e37",2:"2160f0e318303298c871",3:"b76a7a238239050e784b",4:"0e8f419173892e4b5462",5:"8503b8468be273a033e9",6:"cfe9b80ab51704b08fb2",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 \ No newline at end of file
src/components/active-config/configs/spot-award.vue
...@@ -398,7 +398,6 @@ export default { ...@@ -398,7 +398,6 @@ export default {
arr.push(ele.end); arr.push(ele.end);
} }
}); });
console.log(arr);
let flag = true let flag = true
for(let i = 0; i<arr.length-1; i++) { for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){ for(let j = i+1; j<arr.length; j++){
......
src/components/active-config/reward-config.vue
...@@ -579,7 +579,7 @@ export default { ...@@ -579,7 +579,7 @@ export default {
dealAmountFlag: 0, //成交额开关 1开启 dealAmountFlag: 0, //成交额开关 1开启
dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json dealNumberSettingParam: [], //成交人数奖项 成交人数奖项json
dealAmountSettingParam: [], //成交额奖项 成交额奖项json dealAmountSettingParam: [], //成交额奖项 成交额奖项json
stepType: 2 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励 stepType: 1 //步骤类型 类型：1服务号关注，2活动营销页访问奖励，3会员认证奖励，4游戏参与奖励，5卡券领取奖励6，消费奖励
}, },
// 受邀人奖励 // 受邀人奖励
invitedAward: { invitedAward: {
...@@ -1219,11 +1219,12 @@ export default { ...@@ -1219,11 +1219,12 @@ export default {
that.basePath.map(ele => ele.transName).includes('消费') ? await that.$refs.singleFreeze.submitForm() : true; that.basePath.map(ele => ele.transName).includes('消费') ? await that.$refs.singleFreeze.submitForm() : true;
that.$store.dispatch('saveRewardInfo', that.activeInfoData); that.$store.dispatch('saveRewardInfo', that.activeInfoData);
}else { }else {
let flag = true;
if (!!that.$refs.hasOwnProperty('multConsume') && that.$refs.multConsume.length ) { if (!!that.$refs.hasOwnProperty('multConsume') && that.$refs.multConsume.length ) {
for (let index = 0; index < that.$refs.multConsume.length; index++) { for (let index = 0; index < that.$refs.multConsume.length; index++) {
flag = await that.$refs.multConsume[index].submitForm(); flag = await that.$refs.multConsume[index].submitForm();
}
} }
}
let spot = true; let spot = true;
if (!!that.$refs.hasOwnProperty('multSpot') && that.$refs.multSpot.length ) { if (!!that.$refs.hasOwnProperty('multSpot') && that.$refs.multSpot.length ) {
......
src/components/data-details/invite-log.vue
...@@ -19,6 +19,7 @@ import inviteLog from '@/components/data-details/invite-log.vue'; ...@@ -19,6 +19,7 @@ import inviteLog from '@/components/data-details/invite-log.vue';
:data="tableData" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
:style="{ width: '100%', minHeight: tableH }" :style="{ width: '100%', minHeight: tableH }"
@sort-change='sortColumn'
> >
<el-table-column <el-table-column
label="受邀人信息" label="受邀人信息"
...@@ -34,10 +35,10 @@ import inviteLog from '@/components/data-details/invite-log.vue'; ...@@ -34,10 +35,10 @@ import inviteLog from '@/components/data-details/invite-log.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="invitedTime"
label="受邀时间" label="受邀时间"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell"> <div class="cell">
...@@ -47,10 +48,10 @@ import inviteLog from '@/components/data-details/invite-log.vue'; ...@@ -47,10 +48,10 @@ import inviteLog from '@/components/data-details/invite-log.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="transName"
label="转化进度" label="转化进度"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell cursor-pointer color-1890ff" <div class="cell cursor-pointer color-1890ff"
...@@ -88,11 +89,27 @@ export default { ...@@ -88,11 +89,27 @@ export default {
tableData: [], tableData: [],
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: 0 total: 0,
createTimeSort: 0,
transNameSort: 0,
}; };
}, },
methods: { methods: {
/** /**
* sort
*/
sortColumn(column) {
const that = this;
if(column.prop == 'invitedTime'){
that.createTimeSort = column.order== "descending" ? 1 :0;
that.getTableList();
}
if(column.prop == 'transName'){
that.transNameSort = column.order== "descending"? 1 : 0;
that.getTableList();
}
},
/**
* 跳转日志 * 跳转日志
*/ */
toLog(row) { toLog(row) {
...@@ -127,6 +144,8 @@ export default { ...@@ -127,6 +144,8 @@ export default {
activityId: that.$route.query.activityId, activityId: that.$route.query.activityId,
pageNum: that.currentPage, pageNum: that.currentPage,
pageSize: that.pageSize, pageSize: that.pageSize,
createTimeSort: that.createTimeSort,
transNameSort: that.transNameSort
}; };
getRequest('/sharing-core-web/page-activity-invited', para) getRequest('/sharing-core-web/page-activity-invited', para)
.then(res => { .then(res => {
......
src/components/data-details/invite-table.vue
...@@ -19,6 +19,7 @@ import inviteTable from '@/components/data-details/invite-table.vue'; ...@@ -19,6 +19,7 @@ import inviteTable from '@/components/data-details/invite-table.vue';
:data="tableData" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
:style="{ width: '100%' }" :style="{ width: '100%' }"
@sort-change='sortColumn'
> >
<el-table-column <el-table-column
label="邀请人信息" label="邀请人信息"
...@@ -34,10 +35,10 @@ import inviteTable from '@/components/data-details/invite-table.vue'; ...@@ -34,10 +35,10 @@ import inviteTable from '@/components/data-details/invite-table.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="createTime"
label="参与时间" label="参与时间"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell"> <div class="cell">
...@@ -47,10 +48,10 @@ import inviteTable from '@/components/data-details/invite-table.vue'; ...@@ -47,10 +48,10 @@ import inviteTable from '@/components/data-details/invite-table.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="totalTransPersonNum"
label="邀请人数" label="邀请人数"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -60,10 +61,10 @@ import inviteTable from '@/components/data-details/invite-table.vue'; ...@@ -60,10 +61,10 @@ import inviteTable from '@/components/data-details/invite-table.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="sumPoints"
label="积分收益" label="积分收益"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -73,10 +74,10 @@ import inviteTable from '@/components/data-details/invite-table.vue'; ...@@ -73,10 +74,10 @@ import inviteTable from '@/components/data-details/invite-table.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="sumCardNum"
label="卡券收益" label="卡券收益"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -114,7 +115,11 @@ export default { ...@@ -114,7 +115,11 @@ export default {
tableData: [], tableData: [],
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: 0 total: 0,
createTimeSort: 0,
totalTransPersonNumSort: 0,
sumPointsSort: 0,
sumCardNumSort: 0
}; };
}, },
methods: { methods: {
...@@ -126,6 +131,28 @@ export default { ...@@ -126,6 +131,28 @@ export default {
that.$router.push(`/inviterLog?activityId=${that.$route.query.activityId}&inviteOpenId=${row.openId}&tabName=${tabName}`) that.$router.push(`/inviterLog?activityId=${that.$route.query.activityId}&inviteOpenId=${row.openId}&tabName=${tabName}`)
}, },
/** /**
* sort
*/
sortColumn(column) {
const that = this;
if(column.prop == 'createTime'){
that.createTimeSort = column.order== "descending" ? 1 :0;
that.getTableList();
}
if(column.prop == 'totalTransPersonNum'){
that.totalTransPersonNumSort = column.order== "descending"? 1 : 0;
that.getTableList();
}
if(column.prop == 'sumPoints'){
that.sumPointsSort = column.order== "descending"? 1 : 0;
that.getTableList();
}
if(column.prop == 'sumCardNum'){
that.sumCardNumSort = column.order== "descending"? 1 : 0;
that.getTableList();
}
},
/**
* 分页---页码变化 * 分页---页码变化
*/ */
handleSizeChange(val) { handleSizeChange(val) {
...@@ -152,7 +179,10 @@ export default { ...@@ -152,7 +179,10 @@ export default {
activityId: that.$route.query.activityId, activityId: that.$route.query.activityId,
pageNum: that.currentPage, pageNum: that.currentPage,
pageSize: that.pageSize, pageSize: that.pageSize,
createTimeSort: that.createTimeSort || 0,
totalTransPersonNumSort: that.totalTransPersonNumSort || 0,
sumPointsSort: that.sumPointsSort || 0,
sumCardNumSort: that.sumCardNumSort || 0
}; };
getRequest('/sharing-core-web/page-activity-invite', para) getRequest('/sharing-core-web/page-activity-invite', para)
.then(res => { .then(res => {
......
src/components/data-details/invited-table.vue
...@@ -19,6 +19,7 @@ import invitedTable from '@/components/data-details/invited-table.vue'; ...@@ -19,6 +19,7 @@ import invitedTable from '@/components/data-details/invited-table.vue';
:data="tableData" :data="tableData"
tooltip-effect="dark" tooltip-effect="dark"
:style="{ width: '100%' }" :style="{ width: '100%' }"
@sort-change='sortColumn'
> >
<el-table-column <el-table-column
label="受邀人信息" label="受邀人信息"
...@@ -34,15 +35,15 @@ import invitedTable from '@/components/data-details/invited-table.vue'; ...@@ -34,15 +35,15 @@ import invitedTable from '@/components/data-details/invited-table.vue';
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="" prop="createTime"
label="创建时间" label="创建时间"
show-overflow-tooltip show-overflow-tooltip
sortable sortable='custom'
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell"> <div class="cell">
<div>{{ scope.row.invitedTime | timeStampToYmd }}</div> <div>{{ scope.row.createTime | timeStampToYmd }}</div>
<div>{{ scope.row.invitedTime | timeStampToHms }}</div> <div>{{ scope.row.createTime | timeStampToHms }}</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -102,11 +103,22 @@ export default { ...@@ -102,11 +103,22 @@ export default {
tableData: [], tableData: [],
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
total: 0 total: 0,
createTimeSort: 0
}; };
}, },
methods: { methods: {
/** /**
* sort
*/
sortColumn(column) {
const that = this;
if(column.prop == 'createTime'){
that.createTimeSort = column.order== "descending" ? 1 :0;
that.getTableList();
}
},
/**
* 跳转日志 * 跳转日志
*/ */
toLog(row) { toLog(row) {
...@@ -140,6 +152,7 @@ export default { ...@@ -140,6 +152,7 @@ export default {
activityId: that.$route.query.activityId, activityId: that.$route.query.activityId,
pageNum: that.currentPage, pageNum: that.currentPage,
pageSize: that.pageSize, pageSize: that.pageSize,
createTimeSort: that.createTimeSort
}; };
getRequest('/sharing-core-web/page-activity-invited', para) getRequest('/sharing-core-web/page-activity-invited', para)
.then(res => { .then(res => {
......
src/view/activeConfig/index.vue
...@@ -107,6 +107,15 @@ export default { ...@@ -107,6 +107,15 @@ export default {
], ],
} }
}, },
/* watch() {
$route: {
handler(val) {
this.$store.dispatch('clearActiveData');
},
// 深度观察监听
deep: true
}
}, */
methods: { methods: {
/** /**
* 下一步 * 下一步
......
src/view/dataDetails/index.vue
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
</div> </div>
</div> </div>
<div class="data-detail-table"> <div class="data-detail-table">
<invite-table v-if="tabName == 'invite'"></invite-table> <invite-table ref="inviteTable" v-if="tabName == 'invite'"></invite-table>
<invited-table v-if="tabName == 'invited'"></invited-table> <invited-table ref="invitedTable" v-if="tabName == 'invited'"></invited-table>
</div> </div>
</div> </div>
</div> </div>
...@@ -52,8 +52,8 @@ import navCrumb from '@/components/nav/nav.vue'; ...@@ -52,8 +52,8 @@ import navCrumb from '@/components/nav/nav.vue';
import inviteTable from '@/components/data-details/invite-table.vue'; import inviteTable from '@/components/data-details/invite-table.vue';
import invitedTable from '@/components/data-details/invited-table.vue'; import invitedTable from '@/components/data-details/invited-table.vue';
import exportExcel from '@/components/export-excel' import exportExcel from '@/components/export-excel'
import { postExcel } from '@/api/api'; // import { postExcel } from '@/api/api';
import errMsg from '@/common/js/error'; // import errMsg from '@/common/js/error';
// import showMsg from '@/common/js/showmsg'; // import showMsg from '@/common/js/showmsg';
export default { export default {
name: 'dataDetail', name: 'dataDetail',
...@@ -91,34 +91,10 @@ export default { ...@@ -91,34 +91,10 @@ export default {
exportData() { exportData() {
const that = this; const that = this;
that.dialogVisible = true; that.dialogVisible = true;
let para = { that.tableData = that.tabName == 'invite'? that.$refs.inviteTable.tableData: that.$refs.invitedTable.tableData;
that.params = {
activityId: that.$route.query.activityId activityId: that.$route.query.activityId
}; };
postExcel('/sharing-core-web/export-activity-invite', para)
.then(res => {
if (!res.data) {
errMsg.errorMsg('暂无数据');
return false;
}
// let resData = res.data;
const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
const fileName = `报表.csv`;
const elink = document.createElement('a');
elink.download = fileName;
elink.style.display = 'none';
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href); // 释放URL 对象
document.body.removeChild(elink);
// errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
} }
} }
}; };
......
src/view/dataDetails/invitedLog.vue
...@@ -194,14 +194,16 @@ export default { ...@@ -194,14 +194,16 @@ export default {
width: 100%; width: 100%;
.invited-data { .invited-data {
width: 100%; width: 100%;
height: 290px; height: 152px;
.invited-data-img { .invited-data-img {
width: 100px; width: 100px;
height: 100px; height: 100px;
margin: 0 auto; margin: 0 auto;
border-radius: 50%;
img { img {
max-width: 100px; max-width: 100px;
max-height: 100px; max-height: 100px;
border-radius: 50%;
} }
} }
.invited-data-name { .invited-data-name {
......
src/view/dataDetails/inviterLog.vue
...@@ -163,9 +163,11 @@ export default { ...@@ -163,9 +163,11 @@ export default {
width: 100px; width: 100px;
height: 100px; height: 100px;
margin: 0 auto; margin: 0 auto;
border-radius: 50%;
img { img {
max-width: 100px; max-width: 100px;
max-height: 100px; max-height: 100px;
border-radius: 50%;
} }
} }
.inviter-data-name { .inviter-data-name {
......
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