Skip to content

Commit

Permalink
'x'
Browse files Browse the repository at this point in the history
  • Loading branch information
fancyecommerce committed Jun 12, 2018
1 parent d469bcb commit d461a2b
Show file tree
Hide file tree
Showing 6 changed files with 725 additions and 23 deletions.
21 changes: 0 additions & 21 deletions LICENSE
@@ -1,21 +0,0 @@
MIT License

Copyright (c) 2017-present PanJiaChen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
18 changes: 18 additions & 0 deletions src/api/siteadvertise/ads.js
@@ -0,0 +1,18 @@
import request from '@/utils/request'

export function fetchList(query) {
return request({
url: '/v1/advertise/eid/list',
method: 'get',
params: query
})
}

export function fetchTrendInfo(query) {
return request({
url: '/v1/advertise/eid/fetchtrendinfo',
method: 'get',
async: false,
params: query
})
}
52 changes: 51 additions & 1 deletion src/lang/en.js
Expand Up @@ -59,7 +59,7 @@ export default {
adsdetailstics_childchannel: 'Child Channel',
adsdetailstics_channel: 'Channel',
adsdetailstics_edm: 'EDM',

siteadvertise_ads: 'Site Advertise',
dashboard: 'Dashboard',
introduction: 'Introduction',
documentation: 'Documentation',
Expand Down Expand Up @@ -145,6 +145,56 @@ export default {
dynamicTips1: 'Fixed header, sorted by header order',
dynamicTips2: 'Not fixed header, sorted by click order',
first_name: 'First Name',
eid: 'Eid',

fid_main: 'Fid-Main',
ip_main: 'Ip-Main',
browser_name_main: 'Browser-Main',
devide_main: 'Devide-Main',
country_code_main: 'Country-Main',
operate_main: 'Operate-Main',
fec_app_main: 'FecApp-Main',
resolution_main: 'Resolution-Main',
color_depth_main: 'ColorDepth-Main',
language_main: 'Language-Main',
service_datetime: 'ServiceTime',
order: 'Order',
visit_data: 'DetialVisit',
customer_id: 'User No',
visit_page_sku: 'Sku Pv',
visit_page_category: 'Category Pv',
visit_page_search: 'Search Pv',
visit_page_cart: 'AddToCart Pv',
visit_page_order: 'Order Count',
visit_page_order_pending: 'PendingOrder Count',
visit_page_order_processing: 'PaymentOrder Count',
visit_page_order_amount: 'Order Amount',
visit_page_order_pending_amount: 'PendingOrder Amount',
visit_page_order_processing_amount: 'PaymentOrder Amount',
customer_email: 'Customer Email',
fec_content_main: 'Ad-User-Main',
fec_market_group_main: 'Ad-Group-Main',
fec_campaign_main: 'Ad-Campaign-Main',
fec_source_main: 'Ad-Channel-Main',
fec_design_main: 'Ad-Design-Main',
is_return_if: 'Return Customer',
namet: 'Name',
count: 'Count',
order_sku_success_count: 'PaymentOrder Product Count',
refer_url: 'Refer Url',
pv_begin: 'Pv Begin',
pv_end: 'Pv End',
is_return_name: 'User Type',
visit_page_sku_begin: 'sku visit begin',
visit_page_sku_end: 'sku visit end',
visit_page_cart_begin: 'AddToCart Count Begin',
visit_page_cart_end: 'AddToCart Count end',
visit_page_order_begin: 'Order Count Begin',
visit_page_order_end: 'Order Count End',
visit_page_order_processing_begin: 'PaymentOrder Count Begin',
visit_page_order_processing_end: 'PaymentOrder Count End',
sku_image_api_url: 'ProductImage ApiUrl',

last_name: 'Last Name',
state_name: 'State Name',
address1: 'Street 1',
Expand Down
3 changes: 3 additions & 0 deletions src/lang/zh.js
Expand Up @@ -59,6 +59,7 @@ export default {
adsdetailstics_childchannel: '子渠道',
adsdetailstics_channel: '渠道',
adsdetailstics_edm: 'EDM',
siteadvertise_ads: '站内广告',
dashboard: '首页',
introduction: '简述',
documentation: '文档',
Expand Down Expand Up @@ -144,6 +145,7 @@ export default {
dynamicTips1: '固定表头, 按照表头顺序排序',
dynamicTips2: '不固定表头, 按照点击顺序排序',
first_name: '名',
eid: '站内广告编号',

fid_main: 'Fid-主',
ip_main: 'Ip-主',
Expand Down Expand Up @@ -191,6 +193,7 @@ export default {
visit_page_order_end: '订单结束数',
visit_page_order_processing_begin: '支付订单开始数',
visit_page_order_processing_end: '支付订单结束数',
sku_image_api_url: '产品图片ApiUrl',

last_name: '姓',
state_name: '省/市',
Expand Down
17 changes: 16 additions & 1 deletion src/router/index.js
Expand Up @@ -149,6 +149,7 @@ export const asyncRouterMap = [
path: '/adsallstics',
component: Layout,
redirect: 'noredirect',
hidden: true,
name: 'adsallstics',
meta: {
title: 'advertics_all_statics',
Expand Down Expand Up @@ -192,7 +193,20 @@ export const asyncRouterMap = [
{ path: 'adsdetailstics/edm', component: _import('adsdetailstics/edm'), name: 'adsdetailstics-edm', meta: { title: 'adsdetailstics_edm', icon: 'email', roles: ['super_admin', 'common_admin', 'common_admin_child'] }}
]
},

{
path: '/siteadvertise',
component: Layout,
redirect: 'noredirect',
name: 'siteadvertise',
meta: {
title: 'user_statistics',
icon: 'shoppingCard',
roles: ['super_admin', 'common_admin', 'common_admin_child']
},
children: [
{ path: 'siteadvertise/ads', component: _import('siteadvertise/ads'), name: 'siteadvertise-ads', meta: { title: 'siteadvertise_ads', icon: 'shoppingCard', roles: ['super_admin', 'common_admin', 'common_admin_child'] }}
]
},
{
path: '/userstics',
component: Layout,
Expand Down Expand Up @@ -229,6 +243,7 @@ export const asyncRouterMap = [
{
path: '/icon',
component: Layout,
hidden: true,
children: [{
path: 'index',
component: _import('svg-icons/index'),
Expand Down

0 comments on commit d461a2b

Please sign in to comment.