Commit c05baec0 by 陈羽

add:添加列表与新建计划页面

parent 0113c4de
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.611ef6dbce9d0672c7efe94156a40035.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.8840a4288428b22b2c78.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.19fe2027c79604e65f20.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.611ef6dbce9d0672c7efe94156a40035.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.8840a4288428b22b2c78.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.19fe2027c79604e65f20.js></script></body></html>
......@@ -3,7 +3,8 @@
<head>
<meta charset="utf-8"/>
<title>IconFont Demo</title>
<link rel="shortcut icon" href="https://img.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
<link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
<link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
<link rel="stylesheet" href="demo.css">
<link rel="stylesheet" href="iconfont.css">
......@@ -31,6 +32,48 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xea18;</span>
<div class="name">商品-一行两个</div>
<div class="code-name">&amp;#xea18;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xea91;</span>
<div class="name">一行多个</div>
<div class="code-name">&amp;#xea91;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe8ae;</span>
<div class="name">预览</div>
<div class="code-name">&amp;#xe8ae;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7eb;</span>
<div class="name">我的积分</div>
<div class="code-name">&amp;#xe7eb;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">添加热区</div>
<div class="code-name">&amp;#xe651;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xeb57;</span>
<div class="name">指标说明</div>
<div class="code-name">&amp;#xeb57;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe680;</span>
<div class="name">喇叭</div>
<div class="code-name">&amp;#xe680;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64f;</span>
<div class="name">排序</div>
<div class="code-name">&amp;#xe64f;</div>
......@@ -49,12 +92,6 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe64e;</span>
<div class="name">热区绘制</div>
<div class="code-name">&amp;#xe64e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xeb4d;</span>
<div class="name">视频流量</div>
<div class="code-name">&amp;#xeb4d;</div>
......@@ -1419,6 +1456,69 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-shangpin-yihangliangge1"></span>
<div class="name">
商品-一行两个
</div>
<div class="code-name">.icon-shangpin-yihangliangge1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yihangduoge"></span>
<div class="name">
一行多个
</div>
<div class="code-name">.icon-yihangduoge
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-yulan"></span>
<div class="name">
预览
</div>
<div class="code-name">.icon-yulan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-wodejifen"></span>
<div class="name">
我的积分
</div>
<div class="code-name">.icon-wodejifen
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tianjiarequ"></span>
<div class="name">
添加热区
</div>
<div class="code-name">.icon-tianjiarequ
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-zhibiaoshuoming"></span>
<div class="name">
指标说明
</div>
<div class="code-name">.icon-zhibiaoshuoming
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-laba"></span>
<div class="name">
喇叭
</div>
<div class="code-name">.icon-laba
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-paixu1"></span>
<div class="name">
排序
......@@ -1446,15 +1546,6 @@
</li>
<li class="dib">
<span class="icon iconfont icon-requhuizhi"></span>
<div class="name">
热区绘制
</div>
<div class="code-name">.icon-requhuizhi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shipinliuliang"></span>
<div class="name">
视频流量
......@@ -3456,6 +3547,62 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shangpin-yihangliangge1"></use>
</svg>
<div class="name">商品-一行两个</div>
<div class="code-name">#icon-shangpin-yihangliangge1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yihangduoge"></use>
</svg>
<div class="name">一行多个</div>
<div class="code-name">#icon-yihangduoge</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yulan"></use>
</svg>
<div class="name">预览</div>
<div class="code-name">#icon-yulan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-wodejifen"></use>
</svg>
<div class="name">我的积分</div>
<div class="code-name">#icon-wodejifen</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tianjiarequ"></use>
</svg>
<div class="name">添加热区</div>
<div class="code-name">#icon-tianjiarequ</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zhibiaoshuoming"></use>
</svg>
<div class="name">指标说明</div>
<div class="code-name">#icon-zhibiaoshuoming</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-laba"></use>
</svg>
<div class="name">喇叭</div>
<div class="code-name">#icon-laba</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-paixu1"></use>
</svg>
<div class="name">排序</div>
......@@ -3480,14 +3627,6 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-requhuizhi"></use>
</svg>
<div class="name">热区绘制</div>
<div class="code-name">#icon-requhuizhi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shipinliuliang"></use>
</svg>
<div class="name">视频流量</div>
......
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.
......@@ -6,6 +6,55 @@
"description": "",
"glyphs": [
{
"icon_id": "12417923",
"name": "商品-一行两个",
"font_class": "shangpin-yihangliangge1",
"unicode": "ea18",
"unicode_decimal": 59928
},
{
"icon_id": "13727026",
"name": "一行多个",
"font_class": "yihangduoge",
"unicode": "ea91",
"unicode_decimal": 60049
},
{
"icon_id": "19162424",
"name": "预览",
"font_class": "yulan",
"unicode": "e8ae",
"unicode_decimal": 59566
},
{
"icon_id": "435984",
"name": "我的积分",
"font_class": "wodejifen",
"unicode": "e7eb",
"unicode_decimal": 59371
},
{
"icon_id": "15887887",
"name": "添加热区",
"font_class": "tianjiarequ",
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "18049658",
"name": "指标说明",
"font_class": "zhibiaoshuoming",
"unicode": "eb57",
"unicode_decimal": 60247
},
{
"icon_id": "13894326",
"name": "喇叭",
"font_class": "laba",
"unicode": "e680",
"unicode_decimal": 59008
},
{
"icon_id": "16041446",
"name": "排序",
"font_class": "paixu1",
......@@ -27,13 +76,6 @@
"unicode_decimal": 58957
},
{
"icon_id": "17682067",
"name": "热区绘制",
"font_class": "requhuizhi",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "17675917",
"name": "视频流量",
"font_class": "shipinliuliang",
......
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="./static/img/favicon.ico">
<title>GIC后台</title>
<link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/fonts/iconfont.css">
<link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/css/common.css">
<link rel="stylesheet" href="//web-1251519181.file.myqcloud.com/components/element.2.12.0.css">
<!-- element 皮肤 -->
<!-- <link rel="stylesheet" type="text/css" href="http://web-1251519181.file.myqcloud.com/lib/elementUI/theme.1.0.1/index.css"> -->
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<!-- 库引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/components/element.2.12.0.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> -->
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.45.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.19.js"></script><!-- 卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.43.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js"></script><!-- 数据导出 -->
<script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.21.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js"></script><!-- 数据对话 -->
</body>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" href="./static/img/favicon.ico">
<title>GIC后台</title>
<link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/fonts/iconfont.css">
<link rel="stylesheet" type="text/css" href="<%= htmlWebpackPlugin.options.BASE_URL %>static/css/common.css">
<link rel="stylesheet" href="//web-1251519181.file.myqcloud.com/components/element.2.12.0.css">
<!-- element 皮肤 -->
<!-- <link rel="stylesheet" type="text/css" href="http://web-1251519181.file.myqcloud.com/lib/elementUI/theme.1.0.1/index.css"> -->
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
<!-- 库引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/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/components/element.2.12.0.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js"></script> -->
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.45.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.19.js"></script>卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.43.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js"></script><!-- 数据导出 -->
<script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/selector.1.2.21.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js"></script><!-- 数据对话 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.20.js"></script><!-- 卡券弹窗 -->
</body>
</html>
......@@ -338,6 +338,13 @@
"integrity": "sha512-nknWxb5gQv8lYXtJ7S/T8f/S15iUVcIKZfBWPRtvihv7GVrPZu3lDeNfvpdgR5VHG8YZakdhVhg/zvaT5XzPNQ==",
"requires": {
"vue": "^2.5.17"
},
"dependencies": {
"vue": {
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1614616238681&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
"integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
}
}
},
"@types/d3-format": {
......@@ -701,7 +708,7 @@
},
"async-validator": {
"version": "1.8.5",
"resolved": "https://r.cnpmjs.org/async-validator/download/async-validator-1.8.5.tgz",
"resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1605751734916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz",
"integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=",
"requires": {
"babel-runtime": "6.x"
......@@ -4009,7 +4016,7 @@
},
"deepmerge": {
"version": "1.5.2",
"resolved": "https://r.cnpmjs.org/deepmerge/download/deepmerge-1.5.2.tgz",
"resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz",
"integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M="
},
"define-properties": {
......@@ -4385,9 +4392,9 @@
"dev": true
},
"element-ui": {
"version": "2.13.2",
"resolved": "https://r.cnpmjs.org/element-ui/download/element-ui-2.13.2.tgz",
"integrity": "sha1-WCv0eqqqr+I+oZWPriF6aHrQZEc=",
"version": "2.15.1",
"resolved": "https://registry.npm.taobao.org/element-ui/download/element-ui-2.15.1.tgz",
"integrity": "sha1-raAKpuMsAndKLndWPdhGaPgTzf8=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
......@@ -8671,7 +8678,7 @@
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://r.cnpmjs.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
"integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
},
"npm-run-path": {
......@@ -12759,7 +12766,7 @@
},
"resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://r.cnpmjs.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
"resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
},
"resolve": {
......@@ -14224,7 +14231,7 @@
},
"throttle-debounce": {
"version": "1.1.0",
"resolved": "https://r.cnpmjs.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
"resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz",
"integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0="
},
"through": {
......@@ -14896,6 +14903,13 @@
"@types/node": "*",
"viser": "^2.0.0",
"vue": "^2.5.3"
},
"dependencies": {
"vue": {
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1614616238681&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
"integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
}
}
},
"vm-browserify": {
......@@ -14904,11 +14918,6 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
"dev": true
},
"vue": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
"vue-axios": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-2.1.5.tgz",
......@@ -15038,6 +15047,13 @@
"requires": {
"uuid": "^3.3.2",
"vue": "^2.5.16"
},
"dependencies": {
"vue": {
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1614616238681&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
"integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
}
}
},
"vue-router": {
......@@ -15056,9 +15072,9 @@
}
},
"vue-template-compiler": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
"integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
"version": "2.6.12",
"resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.12.tgz",
"integrity": "sha1-lH7XGWdEyKUoXr4SM/6WBDf8xX4=",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
......
......@@ -19,7 +19,7 @@
"animated-vue": "^0.5.3",
"axios": "^0.18.0",
"echarts": "^4.8.0",
"element-ui": "^2.13.2",
"element-ui": "^2.14.1",
"packele": "^1.0.5",
"scriptjs": "^2.5.8",
"tinymce": "^4.9.11",
......@@ -89,7 +89,7 @@
"vue-lazyload": "^1.2.6",
"vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2",
"vue-template-compiler": "^2.6.12",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-dev-server": "^2.11.3",
......
......@@ -442,6 +442,7 @@ export default {
// 判断自定义
if (that.oneLevelTypeValue == 6) {
// eslint-disable-next-line
var selectDefineItem = '';
that.twoLevelOptions.forEach(function(ele, index) {
if (e == ele.id) {
......@@ -503,6 +504,7 @@ export default {
that.threeLevelValue = ''; // 清空三级数据
that.twoLevelSelectValue = '';
that.threeLevelSelectValue = '';
// eslint-disable-next-line
var twoType = selectTwoItem.type;
// 判断三级显示的下拉组件
that.setThreeVisible(twoType, selectTwoItem);
......@@ -577,6 +579,7 @@ export default {
}
});
console.log('resdata: ', resData);
// eslint-disable-next-line
var list = resData.result,
lists = resData.result;
......@@ -634,7 +637,9 @@ export default {
console.log(res, res.data, res.data.errorCode);
var resData = res.data;
if (resData.errorCode == 0) {
// eslint-disable-next-line
var list = [resData.result],
// eslint-disable-next-line
lists = resData.result;
// list.forEach(function(ele,index) {
......@@ -755,6 +760,7 @@ export default {
}
that.$message.error({
duration: 1000,
// eslint-disable-next-line
message: error.message
});
})
......@@ -843,6 +849,7 @@ export default {
}
that.$message.error({
duration: 1000,
// eslint-disable-next-line
message: error.message
});
})
......@@ -1036,6 +1043,7 @@ export default {
// h5 时间开关
timeSwitch(e, obj) {
// eslint-disable-next-line
var that = this;
console.log(e, obj);
},
......@@ -1137,6 +1145,7 @@ export default {
});
return false;
}
// eslint-disable-next-line
that.selectLinkObj.url = that.selectLinkObj.url; // +'?'+that.threeLevelValue
that.selectLinkObj.params = {
storeId: that.threeLevelValue
......
// 弹窗
export default {
path: 'pop',
name: '弹窗推广',
component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/index.vue'),
redirect: '/pop/list',
children: [
{
path: 'list',
name: '计划列表',
component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/list.vue'),
meta: {
path: '/pop/list'
}
},
{
path: 'add',
name: '新建计划',
component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/form.vue'),
meta: {
type: 'add',
path: '/pop/list'
}
},
{
path: 'info/:id',
name: '',
component: () => import(/* webpackChunkName: "cdKey" */ '../../views/pop/form.vue'),
meta: {
type: 'info',
path: '/pop/list'
}
},
{
path: 'edit/:id',
name: '',
component: () => import(/* webpackChunkName: "pop" */ '../../views/pop/form.vue'),
meta: {
type: 'edit',
path: '/pop/list'
}
}
]
};
......@@ -29,6 +29,8 @@ import ewash from './modules/ewash';
import activity from './modules/activity';
//兑换码
import cdKey from './modules/cdKey';
//弹窗推广
import pop from './modules/pop';
export default [
{
......@@ -36,7 +38,7 @@ export default [
name: 'layout',
component: Layout,
redirect: '/wechat/record',
children: [card, ecm, scan, game, message, wechat, msg, calllog, recharge, evaluation, ewash, activity, cdKey]
children: [card, ecm, scan, game, message, wechat, msg, calllog, recharge, evaluation, ewash, activity, cdKey, pop]
},
{
path: '/401',
......
<template>
<div>
<router-view />
</div>
</template>
<script>
export default {
name: 'pop',
created() {
this.$store.commit('aside_handler', false);
this.$nextTick(_ => {
this.$store.commit('aside_handler', true);
});
}
};
</script>
<template>
<section class="dm-wrap" v-loading="recordLoading">
<div class="clearfix pb22">
<el-input v-model="listParams.search" class="w350" placeholder="请输入用户信息/兑换码名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-date-picker class="w350" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="兑换开始日期" end-placeholder="兑换结束日期" @change="refresh"></el-date-picker>
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column :show-overflow-tooltip="true" min-width="120" header-align="left" fixed="left" align="left" prop="memberId" label="会员信息">
<template slot-scope="scope">
<a :href="'/member/#/wechatmemberDetail?memberId=' + scope.row.memberId" target="_blank">
<img class="vertical-middle table__avatar--40" :src="scope.row.memberImgUrl || defaultAvatar" width="60" height="60" />
<div class="inline-block vertical-middle">
<p class="table-name--ellipsis">{{ scope.row.memberName || '--' }}</p>
<!-- <p class="fz13 gray">{{ scope.row.phoneNumber || '--' }}</p> -->
</div>
</a>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" label="兑换时间">
<template slot-scope="scope">
<p class="cell-time">
{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
<span>{{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</span>
</p>
</template>
</el-table-column>
<el-table-column min-width="140" align="left" prop="cdkeyName" label="兑换码名称" :show-overflow-tooltip="true"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" label="兑换码类型">
<template slot-scope="scope">
<!-- 兑换码类型(1:专属,2:通用) -->
{{ scope.row.cdkeyType == 1 ? '专属码' : '通用码' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="140" align="left" prop="cdkey" label="兑换码码值"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="140" align="left" prop="cdkeyContentDescribe" label="兑换内容"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="createTime" label="兑换码状态">
<template slot-scope="scope">
<div v-if="scope.row.convertibilityStatus == 1" class="dm-status--success">成功</div>
<div v-if="scope.row.convertibilityStatus == 2" class="dm-status--error">失败</div>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="120" align="left" prop="convertibilityRemark" label="备注">
<template slot-scope="scope">
{{ scope.row.convertibilityRemark || '--' }}
</template>
</el-table-column>
</el-table>
<dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
</section>
</template>
<script>
import { cdkeyLogRecord } from '@/service/api/cdKeyApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
import tableMethods from '@/mixins/tableMethods.js';
export default {
name: 'cdkey-record',
mixins: [tableMethods],
data() {
return {
recordLoading: false,
tableList: [],
listParams: {
beginTime: '',
endTime: '',
search: '',
currentPage: 1,
pageSize: 20
},
dateTime: ['', ''],
total: 0
};
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '兑换码', path: '' }, { name: '兑换记录', path: '' }]); // eslint-disable-line
this.getTableList();
},
methods: {
formatDateTimeByType,
async getTableList() {
try {
this.recordLoading = true;
if (this.dateTime) {
this.listParams.beginTime = formatDateTimeByType(this.dateTime[0], 'yyyy-MM-dd');
this.listParams.endTime = formatDateTimeByType(this.dateTime[1], 'yyyy-MM-dd');
} else {
this.listParams.beginTime = this.listParams.endTime = '';
}
let res = await cdkeyLogRecord(this.listParams);
if (res.errorCode === 0 && res.result) {
this.tableList = res.result.result || [];
this.total = res.result.totalCount;
} else {
this.tableList = [];
this.total = 0;
}
this.recordLoading = false;
} catch (err) {
this.recordLoading = false;
}
}
}
};
</script>
......@@ -3,7 +3,8 @@
<head>
<meta charset="utf-8"/>
<title>IconFont Demo</title>
<link rel="shortcut icon" href="https://img.alicdn.com/tps/i4/TB1_oz6GVXXXXaFXpXXJDFnIXXX-64-64.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
<link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
<link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
<link rel="stylesheet" href="demo.css">
<link rel="stylesheet" href="iconfont.css">
......@@ -31,6 +32,36 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe8ae;</span>
<div class="name">预览</div>
<div class="code-name">&amp;#xe8ae;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe7eb;</span>
<div class="name">我的积分</div>
<div class="code-name">&amp;#xe7eb;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe651;</span>
<div class="name">添加热区</div>
<div class="code-name">&amp;#xe651;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xeb57;</span>
<div class="name">指标说明</div>
<div class="code-name">&amp;#xeb57;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe680;</span>
<div class="name">喇叭</div>
<div class="code-name">&amp;#xe680;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe64f;</span>
<div class="name">排序</div>
<div class="code-name">&amp;#xe64f;</div>
......@@ -49,12 +80,6 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe64e;</span>
<div class="name">热区绘制</div>
<div class="code-name">&amp;#xe64e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xeb4d;</span>
<div class="name">视频流量</div>
<div class="code-name">&amp;#xeb4d;</div>
......@@ -1419,6 +1444,51 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-yulan"></span>
<div class="name">
预览
</div>
<div class="code-name">.icon-yulan
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-wodejifen"></span>
<div class="name">
我的积分
</div>
<div class="code-name">.icon-wodejifen
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-tianjiarequ"></span>
<div class="name">
添加热区
</div>
<div class="code-name">.icon-tianjiarequ
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-zhibiaoshuoming"></span>
<div class="name">
指标说明
</div>
<div class="code-name">.icon-zhibiaoshuoming
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-laba"></span>
<div class="name">
喇叭
</div>
<div class="code-name">.icon-laba
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-paixu1"></span>
<div class="name">
排序
......@@ -1446,15 +1516,6 @@
</li>
<li class="dib">
<span class="icon iconfont icon-requhuizhi"></span>
<div class="name">
热区绘制
</div>
<div class="code-name">.icon-requhuizhi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shipinliuliang"></span>
<div class="name">
视频流量
......@@ -3456,6 +3517,46 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-yulan"></use>
</svg>
<div class="name">预览</div>
<div class="code-name">#icon-yulan</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-wodejifen"></use>
</svg>
<div class="name">我的积分</div>
<div class="code-name">#icon-wodejifen</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-tianjiarequ"></use>
</svg>
<div class="name">添加热区</div>
<div class="code-name">#icon-tianjiarequ</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-zhibiaoshuoming"></use>
</svg>
<div class="name">指标说明</div>
<div class="code-name">#icon-zhibiaoshuoming</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-laba"></use>
</svg>
<div class="name">喇叭</div>
<div class="code-name">#icon-laba</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-paixu1"></use>
</svg>
<div class="name">排序</div>
......@@ -3480,14 +3581,6 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-requhuizhi"></use>
</svg>
<div class="name">热区绘制</div>
<div class="code-name">#icon-requhuizhi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shipinliuliang"></use>
</svg>
<div class="name">视频流量</div>
......
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.
......@@ -6,6 +6,41 @@
"description": "",
"glyphs": [
{
"icon_id": "19162424",
"name": "预览",
"font_class": "yulan",
"unicode": "e8ae",
"unicode_decimal": 59566
},
{
"icon_id": "435984",
"name": "我的积分",
"font_class": "wodejifen",
"unicode": "e7eb",
"unicode_decimal": 59371
},
{
"icon_id": "15887887",
"name": "添加热区",
"font_class": "tianjiarequ",
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "18049658",
"name": "指标说明",
"font_class": "zhibiaoshuoming",
"unicode": "eb57",
"unicode_decimal": 60247
},
{
"icon_id": "13894326",
"name": "喇叭",
"font_class": "laba",
"unicode": "e680",
"unicode_decimal": 59008
},
{
"icon_id": "16041446",
"name": "排序",
"font_class": "paixu1",
......@@ -27,13 +62,6 @@
"unicode_decimal": 58957
},
{
"icon_id": "17682067",
"name": "热区绘制",
"font_class": "requhuizhi",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "17675917",
"name": "视频流量",
"font_class": "shipinliuliang",
......
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