-
调整前方案
+
方案1
{{xiaoduiObj.bili}}
总流量
@@ -422,7 +422,7 @@
-
调整后方案
+
方案2
{{xiaoduiObj.bili}}
总流量
diff --git a/yanshouban/src/views/media/mediaMannaAdd.vue b/yanshouban/src/views/media/mediaMannaAdd.vue
index 292e3ab..32e7cd2 100644
--- a/yanshouban/src/views/media/mediaMannaAdd.vue
+++ b/yanshouban/src/views/media/mediaMannaAdd.vue
@@ -44,19 +44,19 @@
@@ -69,10 +69,10 @@
-
媒体上传
+
返回
diff --git a/yanshouban/src/views/order/pending/index.vue b/yanshouban/src/views/order/pending/index.vue
index 38935fe..1b76b63 100644
--- a/yanshouban/src/views/order/pending/index.vue
+++ b/yanshouban/src/views/order/pending/index.vue
@@ -198,16 +198,17 @@ export default {
const res = await orderGetAll(formInline)
this.tableData = res.data.list
this.total = res.data.total
- this.tableLoading = false
this.tableData.map(res=>{
res.customerName = this.$decrypt(res.customerName)
res.receiveName = this.$decrypt(res.receiveName)
res.receivePhone = this.$decrypt(res.receivePhone)
+ res.customerPhone = this.$decrypt(res.customerPhone)
res.receiveAdress = this.$decrypt(res.receiveAdress)
res.price = this.$decrypt(res.price)
- res.customerPhone = this.$decrypt(res.customerPhone)
res.address = this.$decrypt(res.address)
})
+ this.tableLoading = false
+
},
// 导出订单
async orderDataExport() {
diff --git a/yanshouban/src/views/order/pending/pendDetails.vue b/yanshouban/src/views/order/pending/pendDetails.vue
index e2e8c1e..fda6928 100644
--- a/yanshouban/src/views/order/pending/pendDetails.vue
+++ b/yanshouban/src/views/order/pending/pendDetails.vue
@@ -247,6 +247,12 @@ export default {
async getProductList() {
const res = await orderGetById({ orderId: this.detailRow.orderId })
this.order = res.data
+ this.order.address = this.$decrypt(this.order.address)
+ this.order.price = this.$decrypt(this.order.price)
+ this.order.customerName = this.$decrypt(this.order.customerName)
+ this.order.receiveAdress = this.$decrypt(this.order.receiveAdress)
+ this.order.receiveName = this.$decrypt(this.order.receiveName)
+ this.order.receivePhone = this.$decrypt(this.order.receivePhone)
},
close() {
this.$emit('cancel')
diff --git a/yanshouban/src/views/promotion/account.vue b/yanshouban/src/views/promotion/account.vue
index 1a26af3..c8bbc30 100644
--- a/yanshouban/src/views/promotion/account.vue
+++ b/yanshouban/src/views/promotion/account.vue
@@ -27,6 +27,17 @@
style="background-color: #3F9B6A;color: #fff;">新增
渠道分类管理
+
投放周期管理
+
投放费用管理
+
投放效果评价管理
+
渠道发布内容汇总统计
+
发布历史效果评估
+
@@ -84,7 +95,10 @@
查看
+
编辑
+ 内容统计数据设置
+ 投放统计数据设置
删除
@@ -171,7 +185,7 @@
-->
-
+
+
+ 活动效果分析
+
+
+
统计分析
+
+
+
{{item.channelCategory}}
+
{{item.contentCategory}}
+
{{item.contentCategoryNum}}
+
+
+
+
+
+
+
+
数据分析
+
+
+
{{item.contentCategory}}
+
{{item.contentCategoryNum}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.$index + 1}}
+
+
+
+
+ {{scope.$index + 1}}
+
+
+
+
+ {{scope.$index + 1}}
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+ {{scope.row.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+ {{scope.$index +1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+ 投放周期设置
+ 投放费用设置
+ 评价
+
+
+
+
+
+
+
+
+
{{title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 取消
+
+
+
+
+
+
@@ -215,7 +410,8 @@
quGetOne,
quAdd,
quEdit,
- quDel
+ quDel,
+ statisticalAnalysis
} from '@/api/account.js'
import {
cereGet,
@@ -224,6 +420,7 @@
cereDel
} from '../../api/activityBz'
import upimg from "@/components/ImageUpload/index"
+ import * as echarts from 'echarts'
export default {
components: { upimg},
data() {
@@ -291,7 +488,21 @@
children: 'children',
label: 'classificationName'
},
- xianFenlei:[]
+ xianFenlei:[],
+ xiaoguoBox:false,
+ chart: null, //饼图
+ chart1: null, //漏斗图
+ dataList:[],
+ xiaoguoList:[],
+ touShow:false,
+ title:'',
+
+ peiShow:false,
+ peiForm:{
+ auditReminderTime:''
+ },
+ ziduan:''
+
}
},
computed: {},
@@ -549,6 +760,151 @@
}
this.getAll()
},
+ async xiaoguo() {
+ // let res = await statisticalAnalysis()
+ // this.xiaoguoList = res.data
+ this.xiaoguoBox = true
+ this.$nextTick(() => {
+ this.shopLiu(this.$refs.shopL);
+ this.jiaoLiu(this.$refs.jiaoL);
+ this.resizeChart = () => {
+ try {
+ this.chart.resize();
+ this.chart1.resize();
+ } catch (error) {
+ console.log(error);
+ }
+ };
+ window.addEventListener('resize', this.resizeChart, false); // false代表事件句柄在冒泡阶段执行
+ })
+ },
+ shopLiu(Dom){
+ this.chart = echarts.init(Dom)
+ let option = {
+ tooltip: {
+ trigger: 'item'
+ },
+
+ legend: {
+ textStyle:{
+ fontSize: 14
+ },
+ icon:'circle',
+ top: '40%',
+ left: '65%'
+ },
+ color:['#50B5FF','#FFC542','#8167F5','#FF7474','#58A3F7'],
+ series: [
+ {
+ type: 'pie',
+ radius: ['40%', '70%'],
+ center:['35%','60%'],
+ avoidLabelOverlap: false,
+ padAngle: 5,
+ itemStyle: {
+ borderRadius: 10
+ },
+ label: {
+ show: false,
+ position: 'center',
+ formatter: '{c}'
+ },
+ emphasis: {
+ label: {
+ show: true,
+ fontSize: 16,
+ }
+ },
+ labelLine: {
+ show: false
+ },
+ data: [
+ { value: 1048, name: '0-20' },
+ { value: 735, name: '20-30' },
+ { value: 580, name: '30-40' },
+ { value: 484, name: '40-50' },
+ { value: 300, name: '50-60' }
+ ]
+ }
+ ]
+ }
+ this.chart.setOption(option)
+ },
+ jiaoLiu(Dom){
+ this.chart1 = echarts.init(Dom)
+ let option = {
+ tooltip: {
+ trigger: 'item',
+ formatter: '{b} : {c}%'
+ },
+ series: [
+ {
+ type: 'funnel',
+ left: '10%',
+ top: 60,
+ bottom: 30,
+ width: '70%',
+ min: 0,
+ max: 100,
+ minSize: '45%',
+ maxSize: '100%',
+ sort: 'descending',
+ gap: 2,
+ label: {
+ show: true,
+ position: 'inside'
+ },
+ labelLine: {
+ length: 10,
+ lineStyle: {
+ width: 1,
+ type: 'solid'
+ }
+ },
+ itemStyle: {
+ borderColor: '#fff',
+ borderWidth: 1
+ },
+ emphasis: {
+ label: {
+ fontSize: 20
+ }
+ },
+ color:['#50B5FF','#5AD8A6','#5D7092','#F6BD16'],
+ data: [
+ { value: 60, name: '访问人数' },
+ { value: 40, name: '提交订单' },
+ { value: 20, name: '支付成功' },
+ { value: 80, name: '到店消费' },
+ ]
+ }
+ ]
+ }
+ this.chart1.setOption(option)
+ },
+ toufang(title){
+
+ this.title = title
+ this.touShow = true
+ },
+ peicao(ziduan,item){
+
+ this.peiId= item.id
+ this.ziduan = ziduan
+ this.peiForm.auditReminderTime = ''
+ this.peiShow = true
+ },
+ async peiCheck(){
+ if(this.ziduan == 'releaseCycle'){
+ await quEdit({id:this.peiId,releaseCycle:this.peiForm.auditReminderTime})
+ }else if(this.ziduan == 'deliveryCost'){
+ await quEdit({id:this.peiId,deliveryCost:this.peiForm.auditReminderTime})
+ }else{
+ await quEdit({id:this.peiId,deliveryEffect:this.peiForm.auditReminderTime})
+ }
+
+ },
+
}
}
@@ -766,8 +1122,16 @@
font-weight:100
}
::v-deep .xiaoguo_css{
+ margin-top:10vh !important;
+ margin-left:10% !important;
.el-dialog__body{
padding:0px !important;
}
}
+ ::v-deep .fenlei{
+ .el-dialog__body{
+ padding:0px !important;
+ }
+ }
+
diff --git a/yanshouban/src/views/revenue/details/index.vue b/yanshouban/src/views/revenue/details/index.vue
index c858768..2d4adfb 100644
--- a/yanshouban/src/views/revenue/details/index.vue
+++ b/yanshouban/src/views/revenue/details/index.vue
@@ -130,7 +130,11 @@ export default {
let res = await getSalesParticular(this.pageIndex)
this.tableData = res.data.list
this.total = res.data.total
-
+ this.tableData.map(res=>{
+ res.dataIntegrity = this.$decrypt(res.dataIntegrity)
+ res.price = this.$decrypt(res.price)
+ res.ticketPrice = this.$decrypt(res.ticketPrice)
+ })
},
search(){
diff --git a/yanshouban/src/views/revenue/totalsales/index.vue b/yanshouban/src/views/revenue/totalsales/index.vue
index 32b50e7..8b4a04f 100644
--- a/yanshouban/src/views/revenue/totalsales/index.vue
+++ b/yanshouban/src/views/revenue/totalsales/index.vue
@@ -47,6 +47,9 @@