Commit d239a1ef by 无尘

fix: 修改bug

parent 5c132125
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>分享有礼</title><link href=./static/css/app.e51ab283030ef4e18fd2abbc605461c4.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.ac753e30d480fd1145e9.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.0333d4e87c34134c059cf7165a541144.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.7f9c2adcf54e2efcff6d.js></script><script type=text/javascript src=./static/js/vendor.8455def81090347f10ce.js></script><script type=text/javascript src=./static/js/app.a5d6a27bac101a87247e.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -160,6 +160,13 @@
"unicode_decimal": 58926
},
{
"icon_id": "908563",
"name": "线下门店",
"font_class": "xianxiamendian",
"unicode": "e69a",
"unicode_decimal": 59034
},
{
"icon_id": "1091359",
"name": "互动传播",
"font_class": "hudongchuanbo",
......@@ -195,6 +202,13 @@
"unicode_decimal": 58890
},
{
"icon_id": "1330563",
"name": "服务号",
"font_class": "fuwuhao1",
"unicode": "e739",
"unicode_decimal": 59193
},
{
"icon_id": "1411463",
"name": "计划",
"font_class": "jihua",
......@@ -314,6 +328,13 @@
"unicode_decimal": 58897
},
{
"icon_id": "3135831",
"name": "客服",
"font_class": "kefu",
"unicode": "e63d",
"unicode_decimal": 58941
},
{
"icon_id": "3180434",
"name": "消费",
"font_class": "xiaofei",
......@@ -1168,6 +1189,20 @@
"unicode_decimal": 59354
},
{
"icon_id": "7762911",
"name": "全渠道",
"font_class": "quanqudao",
"unicode": "e6c5",
"unicode_decimal": 59077
},
{
"icon_id": "7774595",
"name": "复制",
"font_class": "fuzhi",
"unicode": "e66e",
"unicode_decimal": 58990
},
{
"icon_id": "7825273",
"name": "录音中",
"font_class": "luyinzhong",
......@@ -1271,6 +1306,27 @@
"font_class": "canyushuai",
"unicode": "e66a",
"unicode_decimal": 58986
},
{
"icon_id": "11793307",
"name": "资源 9会员招募",
"font_class": "ziyuanhuiyuanzhaomu",
"unicode": "e6c6",
"unicode_decimal": 59078
},
{
"icon_id": "12088492",
"name": "微信商城@2x",
"font_class": "weixinshangchengx",
"unicode": "e63c",
"unicode_decimal": 58940
},
{
"icon_id": "12365126",
"name": "半小人",
"font_class": "banxiaoren",
"unicode": "e9dd",
"unicode_decimal": 59869
}
]
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,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 o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var r={},t={15:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"3946300399ed574c7c3a",3:"55e8efc288475f3370b6",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",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,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,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 o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var r={},t={15:0};function c(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,c),t.l=!0,t.exports}c.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,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"f0728605b4cabfe16cd5",1:"5b546fa38466a0b05e37",2:"3946300399ed574c7c3a",3:"47cdc7ab1727a7c4fcef",4:"67ccecbc8d185b3f1c8c",5:"0c49c41eb27e8038adad",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,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 13:54:35
* @LastEditTime: 2019-12-17 11:44:43
-->
<!--
<data-statistics-child :activeData="activeData" :barChartData="barChartData"></data-statistics-child>
......@@ -77,7 +77,15 @@ import dataStatisticsChild from '@/components/active/data-statistics-child.vue';
:key="key + 'xrbg'"
></i>
</template>
<template v-for="(child, key) in 10 - Math.floor(activeData.spread)">
<svg
v-if="(Math.floor(activeData.spread) < activeData.spread) && (activeData.spread >= Math.floor(activeData.spread) + 0.5)"
class="icon"
aria-hidden="true"
:key="key + 'xrbg'"
>
<use xlink:href="#icon-banxiaoren"></use>
</svg>
<template v-for="(child, key) in 10 - Math.ceil(activeData.spread)">
<i
class="iconfont icon-xiaoren font-22 icon-xiaoren-opacity"
:key="key + 'xr'"
......@@ -147,6 +155,15 @@ export default {
};
</script>
<style lang="less" scoped>
.icon {
width: 1em;
height: 1em;
font-size: 22px;
margin-left: -5px;
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
}
.data-statistics {
width: 100%;
min-height: 300px;
......
......@@ -4,7 +4,7 @@
* @Author: 无尘
* @Date: 2019-11-13 16:37:02
* @LastEditors: 无尘
* @LastEditTime: 2019-12-15 16:42:15
* @LastEditTime: 2019-12-17 10:37:46
-->
<!--
<will-start-active></will-start-active>
......@@ -44,6 +44,11 @@ import willStartActive from '@/components/active/will-start-active.vue';
plain
@click="toDataList(index, item)"
>数据明细</el-button>
<el-button
type="primary"
plain
@click="toDelList(index, item)"
>数据明细</el-button>
</div>
</div>
<div
......@@ -76,7 +81,7 @@ import willStartActive from '@/components/active/will-start-active.vue';
</template>
<script>
import outDateActive from '@/components/active/out-date-active.vue';
// 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 {
......@@ -176,6 +181,43 @@ export default {
this.currentPage = val;
this.getTableList();
},
/**
* 删除
*/
toDelList(index, item){
const that = this;
this.$confirm('是否要删除该活动?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
that.delData(item.activityId);
}).catch(() => {})
},
delData(activityId) {
const that = this;
let para = {
activityId: activityId
};
getRequest('/sharing-core-web/delete-activity', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
showMsg.showmsg('删除成功', 'success');
that.currentPage = 1;
that.getTableList();
return false;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 获取列表数据
*/
......
No preview for this file type
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -160,6 +160,13 @@
"unicode_decimal": 58926
},
{
"icon_id": "908563",
"name": "线下门店",
"font_class": "xianxiamendian",
"unicode": "e69a",
"unicode_decimal": 59034
},
{
"icon_id": "1091359",
"name": "互动传播",
"font_class": "hudongchuanbo",
......@@ -195,6 +202,13 @@
"unicode_decimal": 58890
},
{
"icon_id": "1330563",
"name": "服务号",
"font_class": "fuwuhao1",
"unicode": "e739",
"unicode_decimal": 59193
},
{
"icon_id": "1411463",
"name": "计划",
"font_class": "jihua",
......@@ -314,6 +328,13 @@
"unicode_decimal": 58897
},
{
"icon_id": "3135831",
"name": "客服",
"font_class": "kefu",
"unicode": "e63d",
"unicode_decimal": 58941
},
{
"icon_id": "3180434",
"name": "消费",
"font_class": "xiaofei",
......@@ -1168,6 +1189,20 @@
"unicode_decimal": 59354
},
{
"icon_id": "7762911",
"name": "全渠道",
"font_class": "quanqudao",
"unicode": "e6c5",
"unicode_decimal": 59077
},
{
"icon_id": "7774595",
"name": "复制",
"font_class": "fuzhi",
"unicode": "e66e",
"unicode_decimal": 58990
},
{
"icon_id": "7825273",
"name": "录音中",
"font_class": "luyinzhong",
......@@ -1271,6 +1306,27 @@
"font_class": "canyushuai",
"unicode": "e66a",
"unicode_decimal": 58986
},
{
"icon_id": "11793307",
"name": "资源 9会员招募",
"font_class": "ziyuanhuiyuanzhaomu",
"unicode": "e6c6",
"unicode_decimal": 59078
},
{
"icon_id": "12088492",
"name": "微信商城@2x",
"font_class": "weixinshangchengx",
"unicode": "e63c",
"unicode_decimal": 58940
},
{
"icon_id": "12365126",
"name": "半小人",
"font_class": "banxiaoren",
"unicode": "e9dd",
"unicode_decimal": 59869
}
]
}
No preview for this file type
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