Skip to content

S
shareConfig
Commit 563462f8 by 无尘
Options

fix: 修改显示配置

parent 156f299e
Showing with 216 additions and 81 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.676c2000d9f6e85e59e7361965573a79.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.412246f1b9ad8272162f.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.b636bbb3c188702ecb56b4f194552b1a.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.a03b55c3482cd7b40941.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/css/app.676c2000d9f6e85e59e7361965573a79.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.b636bbb3c188702ecb56b4f194552b1a.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/2.2ff34f317b3949457f35.js → dist/static/js/2.377fd9be43a43725324d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.412246f1b9ad8272162f.js → dist/static/js/manifest.a03b55c3482cd7b40941.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:"2ff34f317b3949457f35",3:"c76f569ac3ba28cd9b18",4:"aed149db41c527449d12",5:"d03770ea38192cbe1548",6:"fda09ea240d5c03fd4f4",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"b96af0829c134b12bfbb"}[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,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:"69740d120cfc169ec444",5:"94997993eacba0ac0ae8",6:"cfe9b80ab51704b08fb2",7:"b0fd74564cc799593b8f",8:"fe9ec49f63ecd8e527ba",9:"522a01ff8d619d2bf030",10:"e16b73d2d4b922255e52",11:"c11d02c33702d00b2e2e",12:"b96af0829c134b12bfbb"}[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/base-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 15:48:46
* @LastEditTime: 2019-12-04 09:52:10
-->
<!--
<base-config @submitNext="submitNext"></base-config>
......@@ -108,7 +108,6 @@ export default {
},
data() {
const checkDate = (rule, value, callback) => {
console.log(value)
if (!value || !value.length) {
callback(new Error('请选择活动有效期'));
} else if (value[0].split(' ')[0] == timeFormat.timeStampToYmd(new Date().getTime()) && value[0].split(' ')[0] == value[1].split(' ')[0]) {
......
src/components/active-config/configs/spot-award.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-21 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 14:29:41
* @LastEditTime: 2019-12-04 10:03:47
-->
<!--
<spot-award></spot-award>
......@@ -382,10 +382,39 @@ export default {
that.$refs['rewardForm'].validate(valid => {
if (valid) {
that.$emit('input', that.instanceAward);
if(that.instanceAward.instanceMade == 2 && !that.instanceAward.instanceContent.length){
resolve(false);
}
// 阶梯奖励没有勾选无穷大判断
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length>1&&!that.instanceAward.instanceContent[that.instanceAward.instanceContent.length-1].infinity) {
resolve(false);
}
// 阶梯奖励中顺序值判断
if(that.instanceAward.instanceMade == 2 && that.instanceAward.instanceContent.length>1){
const arr = [];
that.instanceAward.instanceContent.forEach(ele => {
arr.push(ele.start);
if(ele.end != -1) {
arr.push(ele.end);
}
});
console.log(arr);
let flag = true
for(let i = 0; i<arr.length-1; i++) {
for(let j = i+1; j<arr.length; j++){
if(arr[i]>=arr[j]){
flag = false;
break;
}
}
if (!flag) {
break;
}
}
if (!flag) {
resolve(false);
}
}
resolve(that.instanceAward);
} else {
resolve(false);
......
src/components/active-config/reward-config.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-18 10:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 17:25:51
* @LastEditTime: 2019-12-04 10:04:27
-->
<!--
<reward-config @submitBack="submitBack" @submitNext="submitNext"></reward-config>
......@@ -1345,7 +1345,8 @@ export default {
let spot = true;
if (!!that.$refs.hasOwnProperty('multSpot') && that.$refs.multSpot.length ) {
for (let index = 0; index < that.$refs.multSpot.length; index++) {
spot = await that.$refs.multSpot[index].submitForm()
spot = await that.$refs.multSpot[index].submitForm();
console.log('spot:',spot)
if (!spot) {
break;
}
......@@ -1358,7 +1359,7 @@ export default {
let entry = true;
if (!!that.$refs.hasOwnProperty('multEntry') && that.$refs.multEntry.length ) {
for (let index = 0; index < that.$refs.multEntry.length; index++) {
entry = await that.$refs.multEntry[index].submitForm()
entry = await that.$refs.multEntry[index].submitForm();
if (!entry) {
break;
}
......@@ -1427,7 +1428,7 @@ export default {
if (resData.errorCode == 1) {
showMsg.showmsg('活动创建成功', 'success');
that.$store.dispatch('clearActiveData');
that.$router.push('/createCompletion');
that.$router.push(`/createCompletion?url=${resData.result}`);
return;
}
errMsg.errorMsg(resData);
......
src/components/active/finished-active.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-11-27 11:14:01
* @LastEditTime: 2019-12-03 20:51:06
-->
<!--
<finished-active></finished-active>
......@@ -16,37 +16,67 @@ import finishedActive from '@/components/active/finished-active.vue';
<div class="finished-active border-box">
<ul>
<template v-for="(item, index) in finishedData">
<li :class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']" :key="index + 'data'">
<div class="finished-active-title flex flex-space-between border-box" @click.stop="selectLi(item)">
<li
:class="['border-box', selectItem == item.activityId && index != 0 ? 'li-border' : '']"
:key="index + 'data'"
>
<div
class="finished-active-title flex flex-space-between border-box"
@click.stop="selectLi(item)"
>
<div class="active-title-left">
<div class="active-title-name font-18 color-303133">{{ item.activityName }}</div>
<div class="active-title-date font-14 color-909399 m-t-7">{{ item.startDate | formatTimeYmdHms }} - {{ item.endDate | formatTimeYmdHms }}</div>
</div>
<div class="active-title-right">
<el-button type="primary" plain @click="toEdit(index, item)">活动配置</el-button>
<el-button
type="primary"
plain
@click="toEdit(index, item)"
>活动配置</el-button>
<!-- <el-button
type="primary"
plain
@click="handleCopy(index, item)"
>复制路径</el-button> -->
<el-button type="primary" plain @click="toDataList(index, item)">数据明细</el-button>
<el-button
type="primary"
plain
@click="toDataList(index, item)"
>数据明细</el-button>
</div>
</div>
<div v-if="selectItem == item.activityId" class="finished-active-body">
<out-date-active :barChartData="barChartData" :funnelData="funnelData"></out-date-active>
<div
v-if="selectItem == item.activityId"
class="finished-active-body"
>
<out-date-active
:barChartData="barChartData"
:funnelData="funnelData"
></out-date-active>
</div>
</li>
</template>
</ul>
<div class="pagination text-right m-t-14" v-if="finishedData.length">
<el-pagination small :page-size="pageSize" :current-page="currentPage" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange"> </el-pagination>
<div
class="pagination text-right m-t-14"
v-if="finishedData.length"
>
<el-pagination
small
:page-size="pageSize"
:current-page="currentPage"
layout="prev, pager, next"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
> </el-pagination>
</div>
</div>
</template>
<script>
import outDateActive from '@/components/active/out-date-active.vue';
import Clipboard from 'clipboard';
import showMsg from '@/common/js/showmsg';
// import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error';
import { getRequest } from '@/api/api';
export default {
......@@ -126,27 +156,6 @@ export default {
that.$router.push(`/dataDetail?activityId=${row.activityId}`);
},
/**
* 复制路径
*/
handleCopy(index, row) {
let clipboard = new Clipboard('.copy-tag', {
text: function() {
return `${window.location.origin}/?articleId=${row.articleId}`;
}
});
clipboard.on('success', e => {
showMsg.showmsg('复制成功!', 'success');
// 释放内存
clipboard.destroy();
});
clipboard.on('error', e => {
// 不支持复制
showMsg.showmsg('该浏览器不支持自动复制!', 'warning');
// 释放内存
clipboard.destroy();
});
},
/**
* 分页
*/
handleSizeChange(val) {
......
src/components/active/in-progress-active.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-03 18:19:32
* @LastEditTime: 2019-12-03 20:51:44
-->
<!--
<in-progress-active></in-progress-active>
......@@ -36,7 +36,7 @@ import inProgressActive from '@/components/active/in-progress-active.vue';
>活动配置</el-button>
<el-button
data-clipboard-action="copy"
:data-clipboard-text="item.acitivityUrl"
:data-clipboard-text="item.activityUrl"
class="copy-tag"
type="primary"
plain
......@@ -91,7 +91,7 @@ export default {
activityName: '',
startDate: '',
endDate: '',
acitivityUrl: ''
activityUrl: ''
}
]
};
......@@ -154,7 +154,7 @@ export default {
const fakeElement = document.createElement('button')
let clipboard = new Clipboard(fakeElement, {
text: function() {
return row.acitivityUrl;
return row.activityUrl;
}
});
clipboard.on('success', e => {
......
src/components/data-details/card-log.vue
......@@ -23,8 +23,8 @@ import cardLog from '@/components/data-details/card-log.vue';
</el-table-column>
<el-table-column label="受邀人信息" show-overflow-tooltip>
<template slot-scope="scope">
<div class="cell">
<img src="" alt="" />><span class="font-14 color-606266">{{ scope.row.name || '--' }}</span>
<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>
</div>
</template>
</el-table-column>
......@@ -76,11 +76,13 @@ export default {
getTableList() {
const that = this;
let para = {
inviteOpenId: that.$route.query.inviteOpenId,
activityId: that.$route.query.activityId,
pageNum: that.currentPage,
pageSize: that.pageSize,
awardType: 2
};
getRequest('/sharing-core-web/pag-activity-invited-log', para)
getRequest('/sharing-core-web/page-activity-invited-log', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
......@@ -97,11 +99,21 @@ export default {
});
});
}
}
},
mounted() {
const that = this;
that.getTableList();
},
};
</script>
<style lang="less" scoped>
.card-log {
width: 100%;
.cell {
img {
width: 40px;
height: 40px;
}
}
}
</style>
src/components/data-details/invite-log.vue
......@@ -25,11 +25,11 @@ import inviteLog from '@/components/data-details/invite-log.vue';
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div class="cell flex flex-align-center">
<img
:src="scope.row.headUrl"
alt=""
/><span class="font-14 color-606266">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
/><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
</div>
</template>
</el-table-column>
......@@ -52,7 +52,12 @@ import inviteLog from '@/components/data-details/invite-log.vue';
show-overflow-tooltip
sortable
>
<template slot-scope="scope">{{ scope.row.storeName || '--' }}</template>
<template slot-scope="scope">
<div class="cell cursor-pointer color-1890ff"
@click="toLog(scope.row)">
{{ scope.row.transName || '--' }}
</div>
</template>
</el-table-column>
</el-table>
<div
......@@ -88,6 +93,13 @@ export default {
},
methods: {
/**
* 跳转日志
*/
toLog(row) {
const that = this;
that.$router.push(`/invitedLog?activityId=${that.$route.query.activityId}&inviteOpenId=${row.openId}`)
},
/**
* 分页---页码变化
*/
handleSizeChange(val) {
......@@ -111,11 +123,12 @@ export default {
getTableList() {
const that = this;
let para = {
inviteOpenId: that.$route.query.inviteOpenId,
activityId: that.$route.query.activityId,
pageNum: that.currentPage,
pageSize: that.pageSize,
};
getRequest('/sharing-core-web/pag-activity-invited-log', para)
getRequest('/sharing-core-web/page-activity-invited', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
......@@ -142,5 +155,11 @@ export default {
<style lang="less" scoped>
.invite-log {
width: 100%;
.cell {
img {
width: 40px;
height: 40px;
}
}
}
</style>
src/components/data-details/invite-table.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-11-26 09:29:52
* @LastEditTime: 2019-12-04 10:45:06
-->
<!--
<invite-table></invite-table>
......@@ -25,11 +25,11 @@ import inviteTable from '@/components/data-details/invite-table.vue';
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div class="cell flex flex-align-center">
<img
:src="scope.row.headUrl"
alt=""
/><span class="font-14 color-606266">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
/><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
</div>
</template>
</el-table-column>
......@@ -44,7 +44,6 @@ import inviteTable from '@/components/data-details/invite-table.vue';
<div>{{ scope.row.createTime | timeStampToYmd }}</div>
<div>{{ scope.row.createTime | timeStampToHms }}</div>
</div>
</template>
</el-table-column>
<el-table-column
......@@ -53,7 +52,12 @@ import inviteTable from '@/components/data-details/invite-table.vue';
show-overflow-tooltip
sortable
>
<template slot-scope="scope"><div class="cell" @click="toLog('invite')">{{ scope.row.totalTransPersonNum || '--' }}</div></template>
<template slot-scope="scope">
<div
class="cell cursor-pointer color-1890ff"
@click="toLog('invite',scope.row)"
>{{ scope.row.totalTransPersonNum || '--' }}</div>
</template>
</el-table-column>
<el-table-column
prop=""
......@@ -61,7 +65,12 @@ import inviteTable from '@/components/data-details/invite-table.vue';
show-overflow-tooltip
sortable
>
<template slot-scope="scope"><div class="cell" @click="toLog('point')">{{ scope.row.sumPoints || '--' }}</div></template>
<template slot-scope="scope">
<div
class="cell cursor-pointer color-1890ff"
@click="toLog('point',scope.row)"
>{{ scope.row.sumPoints || '--' }}</div>
</template>
</el-table-column>
<el-table-column
prop=""
......@@ -69,7 +78,12 @@ import inviteTable from '@/components/data-details/invite-table.vue';
show-overflow-tooltip
sortable
>
<template slot-scope="scope"><div class="cell" @click="toLog('card')">{{ scope.row.sumCardNum }}</div></template>
<template slot-scope="scope">
<div
class="cell cursor-pointer color-1890ff"
@click="toLog('card',scope.row)"
>{{ scope.row.sumCardNum }}</div>
</template>
</el-table-column>
</el-table>
<div
......@@ -107,9 +121,9 @@ export default {
/**
* 跳转日志
*/
toLog(tabName) {
toLog(tabName,row) {
const that = this;
that.$router.push(`/inviterLog?activityId=${that.$route.query.activityId}&tabName=${tabName}`)
that.$router.push(`/inviterLog?activityId=${that.$route.query.activityId}&inviteOpenId=${row.openId}&tabName=${tabName}`)
},
/**
* 分页---页码变化
......@@ -167,5 +181,11 @@ export default {
<style lang="less" scoped>
.invite-table {
width: 100%;
.cell {
img {
width: 40px;
height: 40px;
}
}
}
</style>
src/components/data-details/invited-table.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-11-26 13:41:35
* @LastEditTime: 2019-12-04 10:43:42
-->
<!--
<invited-table :funnelData="funnelData"></invited-table>
......@@ -25,11 +25,11 @@ import invitedTable from '@/components/data-details/invited-table.vue';
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div class="cell flex flex-align-center">
<img
:src="scope.row.headUrl"
alt=""
/><span class="font-14 color-606266">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
/><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
</div>
</template>
</el-table-column>
......@@ -51,11 +51,11 @@ import invitedTable from '@/components/data-details/invited-table.vue';
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div class="cell flex flex-align-center">
<img
src=""
:src="scope.row.inviteOpenHeadUrl"
alt=""
/><span class="font-14 color-606266">{{ scope.row.name || '--' }}</span>
/><span class="font-14 color-606266 p-l-10">{{ scope.row.inviteOpenNickName || '--' }}/{{scope.row.inviteOpenRealName || '--'}}</span>
</div>
</template>
</el-table-column>
......@@ -65,7 +65,13 @@ import invitedTable from '@/components/data-details/invited-table.vue';
label="转化进度"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.storeName || '--' }}</template>
<template slot-scope="scope">
<div
class="cell cursor-pointer color-1890ff"
@click="toLog(scope.row)">
{{ scope.row.transName || '--' }}
</div>
</template>
</el-table-column>
</el-table>
<div
......@@ -101,6 +107,13 @@ export default {
},
methods: {
/**
* 跳转日志
*/
toLog(row) {
const that = this;
that.$router.push(`/invitedLog?activityId=${that.$route.query.activityId}&inviteOpenId=${row.openId}`)
},
/**
* 分页---页码变化
*/
handleSizeChange(val) {
......@@ -155,5 +168,11 @@ export default {
<style lang="less" scoped>
.invited-table {
width: 100%;
.cell {
img {
width: 40px;
height: 40px;
}
}
}
</style>
src/components/data-details/point-log.vue
......@@ -37,18 +37,27 @@ import pointLog from '@/components/data-details/point-log.vue';
label="奖励来源"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.storeName || '--' }}</template>
<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>
</div>
<div>{{scope.row.awardProgram == 1 || scope.row.awardProgram == 2 ? scope.row.awardDetail : scope.row.competitionName }}</div>
</div>
</template>
</el-table-column>
<el-table-column
label="受邀人信息"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="cell">
<div class="cell flex flex-align-center">
<img
:src="scope.row.headUrl"
alt=""
/><span class="font-14 color-606266">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
/><span class="font-14 color-606266 p-l-10">{{ scope.row.nickName || '--' }}/{{scope.row.realName || '--'}}</span>
</div>
</template>
</el-table-column>
......@@ -57,7 +66,7 @@ import pointLog from '@/components/data-details/point-log.vue';
label="奖励额度"
show-overflow-tooltip
>
<template slot-scope="scope">{{ scope.row.storeName || '--' }}</template>
<template slot-scope="scope">{{ scope.row.awardPoint || '--' }}</template>
</el-table-column>
</el-table>
<div
......@@ -88,7 +97,8 @@ export default {
tableData: [],
currentPage: 1,
pageSize: 20,
total: 0
total: 0,
};
},
methods: {
......@@ -116,11 +126,13 @@ export default {
getTableList() {
const that = this;
let para = {
inviteOpenId: that.$route.query.inviteOpenId,
activityId: that.$route.query.activityId,
pageNum: that.currentPage,
pageSize: that.pageSize,
awardType: 1
};
getRequest('/sharing-core-web/pag-activity-invited-log', para)
getRequest('/sharing-core-web/page-activity-invited-log', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
......@@ -137,11 +149,21 @@ export default {
});
});
}
}
},
mounted() {
const that = this;
that.getTableList();
},
};
</script>
<style lang="less" scoped>
.point-log {
width: 100%;
.cell {
img {
width: 40px;
height: 40px;
}
}
}
</style>
src/view/activeConfig/createCompletion.vue
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-15 10:10:08
* @LastEditors: 无尘
* @LastEditTime: 2019-11-20 10:02:30
* @LastEditTime: 2019-12-03 20:56:39
-->
<template>
......@@ -57,13 +57,15 @@ export default {
/*relocation: true */
},
],
activityUrl: ''
}
},
methods: {
copyPath() {
const that = this;
let clipboard = new Clipboard('.copy-tag', {
text: function() {
return `${window.location.origin}`;
return `${that.activityUrl}`;
}
});
clipboard.on('success', e => {
......@@ -82,6 +84,9 @@ export default {
this.$router.push(`/shareIndex`);
}
},
mounted() {
this.activityUrl = this.$route.query.url;
},
}
</script>
<style lang="less" scoped>
......
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