Skip to content

M
memberTag-web
Commit 9c87b797 by member
Options

合并远程dev分支

parents 7405210f d5dd8c43
Showing with 357 additions and 36 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.52912751d86966fdf16510ac007667b7.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.b7aaaa4daefc7cdd16f8.js></script><script type=text/javascript src=./static/js/vendor.c30398db3b176e06f763.js></script><script type=text/javascript src=./static/js/app.c6f37bd7251ab52b7d29.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>GIC-会员标签</title><link href=./static/css/app.d46edb62e737973015fc45fa8687c21f.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.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.0aa436e3bf38abfe76a7.js></script><script type=text/javascript src=./static/js/vendor.c30398db3b176e06f763.js></script><script type=text/javascript src=./static/js/app.f34ba1c04bf0e9b0d621.js></script></body></html>
\ No newline at end of file
dist/static/css/app.52912751d86966fdf16510ac007667b7.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.d46edb62e737973015fc45fa8687c21f.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/font/demo_index.html
......@@ -259,6 +259,12 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe629;</span>
<div class="name">打勾</div>
<div class="code-name">&amp;#xe629;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6fd;</span>
<div class="name">icon-二维码</div>
<div class="code-name">&amp;#xe6fd;</div>
......@@ -619,6 +625,12 @@
</li>
<li class="dib">
<span class="icon iconfont">&#xe62b;</span>
<div class="name">编辑</div>
<div class="code-name">&amp;#xe62b;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6e8;</span>
<div class="name">下载</div>
<div class="code-name">&amp;#xe6e8;</div>
......@@ -1317,6 +1329,15 @@
</li>
<li class="dib">
<span class="icon iconfont icon-dagou"></span>
<div class="name">
打勾
</div>
<div class="code-name">.icon-dagou
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-icon-QRcode"></span>
<div class="name">
icon-二维码
......@@ -1857,6 +1878,15 @@
</li>
<li class="dib">
<span class="icon iconfont icon-bianji1"></span>
<div class="name">
编辑
</div>
<div class="code-name">.icon-bianji1
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-icon_yunxiazai"></span>
<div class="name">
下载
......@@ -2650,6 +2680,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-dagou"></use>
</svg>
<div class="name">打勾</div>
<div class="code-name">#icon-dagou</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-icon-QRcode"></use>
</svg>
<div class="name">icon-二维码</div>
......@@ -3130,6 +3168,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-bianji1"></use>
</svg>
<div class="name">编辑</div>
<div class="code-name">#icon-bianji1</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-icon_yunxiazai"></use>
</svg>
<div class="name">下载</div>
......
dist/static/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/font/iconfont.svg
......@@ -134,6 +134,9 @@ Created by iconfont
<glyph glyph-name="xiaofei" unicode="&#58889;" d="M683.008 401.984q14.016 0 24 10.016t10.016 24-10.016 24-24 10.016l-88.992 0 88 88q11.008 10.016 11.008 24t-10.016 24.512-24.512 10.496-24.512-10.016l-124.992-126.016-124.992 126.016q-10.016 10.016-24 10.016t-24-10.016-10.016-24.512 10.016-24.512l88-88-83.008 0q-14.016 0-24-10.016t-10.016-24 10.016-24 24-10.016l136.992 0 0-68-136.992 0q-14.016 0-24-10.016t-10.016-24.512 10.016-24.512 24-10.016l136.992 0 0-79.008q0-15.008 10.016-24.992t24-10.016 24 10.016 10.016 24.992l0 79.008 136.992 0q14.016 0 24 10.016t10.016 24.512-10.016 24.512-24 10.016l-136.992 0 0 68 136.992 0zM512 896q-104 0-199.008-40.512t-163.488-108.992-108.992-163.488-40.512-199.008 40.512-199.008 108.992-163.488 163.488-108.992 199.008-40.512 199.008 40.512 163.488 108.992 108.992 163.488 40.512 199.008-40.512 199.008-108.992 163.488-163.488 108.992-199.008 40.512zM512-56.99199999999996q-90.016 0-171.488 35.008t-140.512 94.016-94.016 140.512-35.008 171.488 35.008 171.488 94.016 140.512 140.512 94.016 171.488 35.008 171.488-35.008 140.512-94.016 94.016-140.512 35.008-171.488-35.008-171.488-94.016-140.512-140.512-94.016-171.488-35.008z" horiz-adv-x="1024" />
<glyph glyph-name="dagou" unicode="&#58921;" d="M975.928889 585.007407L748.088889 355.271111l-87.893333 85.997037L631.466667 412.444444l116.622222-114.725925 256.663704 258.465185-28.823704 28.823703z m0 0" horiz-adv-x="1820" />
<glyph glyph-name="icon-QRcode" unicode="&#59133;" d="M120.32 775.6800000000001h60.416v-60.416H120.32V775.6800000000001zM0 896h301.056v-301.056H0V896z m60.416-241.152h180.736V835.5840000000001H60.416v-180.736zM903.68 715.264h-60.416V775.6800000000001h60.416v-60.416zM1024 594.944h-301.056V896H1024v-301.056z m-60.416 240.64h-180.736v-180.736h180.736V835.5840000000001zM120.32 52.73599999999999h60.416v-60.416H120.32v60.416zM0 173.05600000000004h301.056V-128H0v301.056z m60.416-240.64h180.736v180.736H60.416v-180.736zM481.792 715.264h-60.416V775.6800000000001H360.96V835.5840000000001h60.416V896h180.736v-60.416h-120.32v-60.416h60.416v-120.32h-60.416V715.264z m60.416-60.416h59.904v-60.416h-60.416V654.848h0.512z m120.32 60.416v-60.416h-60.416V715.264h60.416z m0 60.416h-60.416V835.5840000000001h60.416V775.6800000000001z m120.32-301.568h60.416v-60.416h-60.416v60.416z m-240.64 60.416v-60.416H361.472V534.528h60.416v120.32h60.416v-120.32h59.904z m59.904 60.416h60.416v-120.32h-60.416v120.32z m120.832-60.416h59.904v-60.416h-60.416V534.528h0.512z m240.64 0v-60.416h-120.32V534.528h120.32z m-301.056-120.32v59.904h60.416v-60.416h-60.416v0.512z m120.32-60.416h-60.416v60.416h60.416v-60.416zM1024 414.208h-60.416v59.904H1024v-59.904z m0-60.416v-60.416h-60.416v60.416H1024z m-60.416-59.904v-60.416h-60.416v60.416h60.416zM1024 173.05600000000004v-120.32h-60.416v60.416h-60.416v60.416H1024v-0.512z m-120.32-120.32h-120.32v60.416h120.32v-60.416zM241.152 353.79200000000003v60.416h60.416v-60.416H241.152z m421.376-301.056h60.416v-60.416h-60.416v60.416z m60.416-60.416H1024V-128h-60.416v60.416h-60.416V-128h-60.416v60.416h-60.416V-128H601.6v60.416h121.344V-7.67999999999995zM481.792-128v60.416h60.416V-128h-60.416z m-59.904 0H361.472v60.416h60.416V-128z m0 421.888h-120.32v60.416h60.416v59.904h60.416v-60.416h60.416v-180.736h-120.32v60.416h60.416v60.416h-1.024z m180.224-361.472h-60.416v60.416h60.416v-60.416z m120.832 240.64h59.904v-60.416h-120.32v120.32h60.416v-59.904z m59.904 180.736h60.416v60.416h60.416v-120.32h-60.416v-60.416h60.416v-60.416h-120.32v180.736h-0.512z m-240.64-301.056v-60.416h-60.416v60.416h-60.416v-60.416H360.96v120.32h181.248v120.32h59.904v-180.736h-59.904v0.512z m180.736 241.152h-60.416v-60.416h-60.416v60.416h-60.416v60.416h181.248v-60.416z m-120.832 120.32h-60.416v59.904h60.416v-59.904z m-59.904 0v-60.416h-60.416v60.416h60.416z m-241.152 0v59.904h60.416v-60.416H301.056v0.512z m-59.904 120.32h60.416v-60.416H241.152V534.528z m-60.416 0v-120.32H120.32v120.32h60.416z m0-240.64v-60.416H120.32v60.416H59.904v60.416H0v119.808h60.416v-60.416h60.416v-60.416h120.32v-60.416H180.736v1.024z m120.32-60.416H240.64v60.416h60.416v-60.416z m-301.056 0v60.416h60.416v-60.416H0z" horiz-adv-x="1024" />
......@@ -314,6 +317,9 @@ Created by iconfont
<glyph glyph-name="shequ-zhutifenxiang" unicode="&#59098;" d="M416.256-87.04c-117.76 0-217.088 37.376-288.256 108.544-69.632 69.632-108.032 168.448-108.032 278.528 0 206.336 167.424 373.76 324.608 425.984 67.072 22.528 135.68 33.28 205.312 32.256 19.968-0.512 35.328-16.384 35.328-36.352-0.512-19.968-14.848-35.84-36.352-35.328-61.44 1.024-122.368-8.704-181.76-28.672-135.68-45.056-275.968-191.488-275.968-358.4 0-90.624 30.72-171.52 87.552-227.84 56.832-56.832 139.264-87.04 237.568-87.04h0.512c243.712 0.512 320 124.416 322.56 141.824 0 5.632-13.312 24.064-20.992 34.816-26.624 37.376-76.288 106.496-6.144 181.76 73.728 79.872 150.016 57.344 195.584 44.544 7.68-2.56 15.872-4.608 22.528-6.144 6.144 23.04 1.024 92.672-59.904 165.888-12.8 15.36-10.24 37.888 4.608 50.176 15.36 12.288 37.888 10.24 50.176-4.608 75.776-91.648 91.648-195.584 67.584-246.272-11.264-23.552-30.72-37.376-53.76-37.376-16.896 0-33.28 4.608-51.2 9.728-43.008 12.288-79.872 23.04-123.904-24.576-28.16-30.208-19.456-48.128 11.776-91.648 16.896-23.552 34.304-48.128 34.304-77.312 0.512-60.416-116.736-211.968-393.728-212.48 0.512 0 0 0 0 0zM364.032 267.264c-30.208 0-49.664 9.728-57.856 28.16-6.656 15.36-3.072 32.768 9.216 46.592 24.064 25.6 26.624 45.568 30.208 68.096 3.584 24.064 7.68 53.76 37.376 81.408 39.936 37.376 103.936 32.768 148.992-9.728 25.088-23.552 38.912-52.224 38.912-81.408 0-24.576-9.728-47.104-28.672-64.512-53.76-50.176-136.192-68.608-178.176-68.608z m84.48 180.224c-6.656 0-12.8-2.56-17.408-7.168-11.264-10.752-12.8-19.456-15.872-40.448-2.56-15.872-6.144-43.008-24.576-64 39.936 4.096 97.792 29.696 107.52 57.856 3.072 8.704-3.072 27.136-13.824 36.864-11.776 10.752-24.576 16.896-35.84 16.896z m134.656 37.376c-8.192 20.48-20.48 30.208-40.448 39.936-19.456 9.728-23.552 27.136-23.552 27.136-3.072 11.776 0 24.064 8.192 34.304 12.8 16.384 24.576 31.744 50.688 56.32 17.92 16.896 252.928 217.088 312.32 217.088 0 0 17.92 3.584 31.744-14.848 8.192-10.752 8.192-24.576 8.192-24.576 0-61.44-230.4-293.376-232.96-295.936-25.6-24.064-47.616-44.032-68.608-54.272-31.232-15.36-45.568 14.848-45.568 14.848zM604.16 568.32c2.56-2.048 5.12-4.608 7.68-7.168l10.24-10.24c7.168 5.632 16.384 13.312 27.136 23.552 30.208 28.672 82.944 86.016 128 138.752-56.32-41.984-118.784-92.16-151.552-122.88-9.216-8.192-15.872-15.872-21.504-22.016z" horiz-adv-x="1024" />
<glyph glyph-name="bianji1" unicode="&#58923;" d="M119.874 180.78v-148.976h149.005l431.385 435.265L551.207 616.04 119.874 180.78z m694.07 399.995c15.735 15.679 15.735 39.231 0 54.856l-90.124 90.238c-15.744 15.655-39.232 15.655-54.977 0l-70.592-70.596 149.057-149.03 66.635 74.532zM472.797 110.213l-78.41-78.41h509.737v78.41H472.798z" horiz-adv-x="1024" />
<glyph glyph-name="icon_yunxiazai" unicode="&#59112;" d="M790.528 486.4c-18.432 141.824-136.704 252.416-278.528 252.416S251.904 628.736 233.472 486.4C117.76 478.72 25.6 378.88 25.6 258.048c0-125.952 99.84-228.864 220.672-228.864h533.504c120.832 2.56 218.112 102.4 218.112 228.864C998.4 378.88 906.24 478.72 790.528 486.4z m-286.208-389.12l-194.56 223.232h131.584V528.384h125.952v-207.872h131.584l-194.56-223.232z" horiz-adv-x="1024" />
......
dist/static/img/iconfont.24c298d.svg → dist/static/img/iconfont.2a84678.svg
......@@ -134,6 +134,9 @@ Created by iconfont
<glyph glyph-name="xiaofei" unicode="&#58889;" d="M683.008 401.984q14.016 0 24 10.016t10.016 24-10.016 24-24 10.016l-88.992 0 88 88q11.008 10.016 11.008 24t-10.016 24.512-24.512 10.496-24.512-10.016l-124.992-126.016-124.992 126.016q-10.016 10.016-24 10.016t-24-10.016-10.016-24.512 10.016-24.512l88-88-83.008 0q-14.016 0-24-10.016t-10.016-24 10.016-24 24-10.016l136.992 0 0-68-136.992 0q-14.016 0-24-10.016t-10.016-24.512 10.016-24.512 24-10.016l136.992 0 0-79.008q0-15.008 10.016-24.992t24-10.016 24 10.016 10.016 24.992l0 79.008 136.992 0q14.016 0 24 10.016t10.016 24.512-10.016 24.512-24 10.016l-136.992 0 0 68 136.992 0zM512 896q-104 0-199.008-40.512t-163.488-108.992-108.992-163.488-40.512-199.008 40.512-199.008 108.992-163.488 163.488-108.992 199.008-40.512 199.008 40.512 163.488 108.992 108.992 163.488 40.512 199.008-40.512 199.008-108.992 163.488-163.488 108.992-199.008 40.512zM512-56.99199999999996q-90.016 0-171.488 35.008t-140.512 94.016-94.016 140.512-35.008 171.488 35.008 171.488 94.016 140.512 140.512 94.016 171.488 35.008 171.488-35.008 140.512-94.016 94.016-140.512 35.008-171.488-35.008-171.488-94.016-140.512-140.512-94.016-171.488-35.008z" horiz-adv-x="1024" />
<glyph glyph-name="dagou" unicode="&#58921;" d="M975.928889 585.007407L748.088889 355.271111l-87.893333 85.997037L631.466667 412.444444l116.622222-114.725925 256.663704 258.465185-28.823704 28.823703z m0 0" horiz-adv-x="1820" />
<glyph glyph-name="icon-QRcode" unicode="&#59133;" d="M120.32 775.6800000000001h60.416v-60.416H120.32V775.6800000000001zM0 896h301.056v-301.056H0V896z m60.416-241.152h180.736V835.5840000000001H60.416v-180.736zM903.68 715.264h-60.416V775.6800000000001h60.416v-60.416zM1024 594.944h-301.056V896H1024v-301.056z m-60.416 240.64h-180.736v-180.736h180.736V835.5840000000001zM120.32 52.73599999999999h60.416v-60.416H120.32v60.416zM0 173.05600000000004h301.056V-128H0v301.056z m60.416-240.64h180.736v180.736H60.416v-180.736zM481.792 715.264h-60.416V775.6800000000001H360.96V835.5840000000001h60.416V896h180.736v-60.416h-120.32v-60.416h60.416v-120.32h-60.416V715.264z m60.416-60.416h59.904v-60.416h-60.416V654.848h0.512z m120.32 60.416v-60.416h-60.416V715.264h60.416z m0 60.416h-60.416V835.5840000000001h60.416V775.6800000000001z m120.32-301.568h60.416v-60.416h-60.416v60.416z m-240.64 60.416v-60.416H361.472V534.528h60.416v120.32h60.416v-120.32h59.904z m59.904 60.416h60.416v-120.32h-60.416v120.32z m120.832-60.416h59.904v-60.416h-60.416V534.528h0.512z m240.64 0v-60.416h-120.32V534.528h120.32z m-301.056-120.32v59.904h60.416v-60.416h-60.416v0.512z m120.32-60.416h-60.416v60.416h60.416v-60.416zM1024 414.208h-60.416v59.904H1024v-59.904z m0-60.416v-60.416h-60.416v60.416H1024z m-60.416-59.904v-60.416h-60.416v60.416h60.416zM1024 173.05600000000004v-120.32h-60.416v60.416h-60.416v60.416H1024v-0.512z m-120.32-120.32h-120.32v60.416h120.32v-60.416zM241.152 353.79200000000003v60.416h60.416v-60.416H241.152z m421.376-301.056h60.416v-60.416h-60.416v60.416z m60.416-60.416H1024V-128h-60.416v60.416h-60.416V-128h-60.416v60.416h-60.416V-128H601.6v60.416h121.344V-7.67999999999995zM481.792-128v60.416h60.416V-128h-60.416z m-59.904 0H361.472v60.416h60.416V-128z m0 421.888h-120.32v60.416h60.416v59.904h60.416v-60.416h60.416v-180.736h-120.32v60.416h60.416v60.416h-1.024z m180.224-361.472h-60.416v60.416h60.416v-60.416z m120.832 240.64h59.904v-60.416h-120.32v120.32h60.416v-59.904z m59.904 180.736h60.416v60.416h60.416v-120.32h-60.416v-60.416h60.416v-60.416h-120.32v180.736h-0.512z m-240.64-301.056v-60.416h-60.416v60.416h-60.416v-60.416H360.96v120.32h181.248v120.32h59.904v-180.736h-59.904v0.512z m180.736 241.152h-60.416v-60.416h-60.416v60.416h-60.416v60.416h181.248v-60.416z m-120.832 120.32h-60.416v59.904h60.416v-59.904z m-59.904 0v-60.416h-60.416v60.416h60.416z m-241.152 0v59.904h60.416v-60.416H301.056v0.512z m-59.904 120.32h60.416v-60.416H241.152V534.528z m-60.416 0v-120.32H120.32v120.32h60.416z m0-240.64v-60.416H120.32v60.416H59.904v60.416H0v119.808h60.416v-60.416h60.416v-60.416h120.32v-60.416H180.736v1.024z m120.32-60.416H240.64v60.416h60.416v-60.416z m-301.056 0v60.416h60.416v-60.416H0z" horiz-adv-x="1024" />
......@@ -314,6 +317,9 @@ Created by iconfont
<glyph glyph-name="shequ-zhutifenxiang" unicode="&#59098;" d="M416.256-87.04c-117.76 0-217.088 37.376-288.256 108.544-69.632 69.632-108.032 168.448-108.032 278.528 0 206.336 167.424 373.76 324.608 425.984 67.072 22.528 135.68 33.28 205.312 32.256 19.968-0.512 35.328-16.384 35.328-36.352-0.512-19.968-14.848-35.84-36.352-35.328-61.44 1.024-122.368-8.704-181.76-28.672-135.68-45.056-275.968-191.488-275.968-358.4 0-90.624 30.72-171.52 87.552-227.84 56.832-56.832 139.264-87.04 237.568-87.04h0.512c243.712 0.512 320 124.416 322.56 141.824 0 5.632-13.312 24.064-20.992 34.816-26.624 37.376-76.288 106.496-6.144 181.76 73.728 79.872 150.016 57.344 195.584 44.544 7.68-2.56 15.872-4.608 22.528-6.144 6.144 23.04 1.024 92.672-59.904 165.888-12.8 15.36-10.24 37.888 4.608 50.176 15.36 12.288 37.888 10.24 50.176-4.608 75.776-91.648 91.648-195.584 67.584-246.272-11.264-23.552-30.72-37.376-53.76-37.376-16.896 0-33.28 4.608-51.2 9.728-43.008 12.288-79.872 23.04-123.904-24.576-28.16-30.208-19.456-48.128 11.776-91.648 16.896-23.552 34.304-48.128 34.304-77.312 0.512-60.416-116.736-211.968-393.728-212.48 0.512 0 0 0 0 0zM364.032 267.264c-30.208 0-49.664 9.728-57.856 28.16-6.656 15.36-3.072 32.768 9.216 46.592 24.064 25.6 26.624 45.568 30.208 68.096 3.584 24.064 7.68 53.76 37.376 81.408 39.936 37.376 103.936 32.768 148.992-9.728 25.088-23.552 38.912-52.224 38.912-81.408 0-24.576-9.728-47.104-28.672-64.512-53.76-50.176-136.192-68.608-178.176-68.608z m84.48 180.224c-6.656 0-12.8-2.56-17.408-7.168-11.264-10.752-12.8-19.456-15.872-40.448-2.56-15.872-6.144-43.008-24.576-64 39.936 4.096 97.792 29.696 107.52 57.856 3.072 8.704-3.072 27.136-13.824 36.864-11.776 10.752-24.576 16.896-35.84 16.896z m134.656 37.376c-8.192 20.48-20.48 30.208-40.448 39.936-19.456 9.728-23.552 27.136-23.552 27.136-3.072 11.776 0 24.064 8.192 34.304 12.8 16.384 24.576 31.744 50.688 56.32 17.92 16.896 252.928 217.088 312.32 217.088 0 0 17.92 3.584 31.744-14.848 8.192-10.752 8.192-24.576 8.192-24.576 0-61.44-230.4-293.376-232.96-295.936-25.6-24.064-47.616-44.032-68.608-54.272-31.232-15.36-45.568 14.848-45.568 14.848zM604.16 568.32c2.56-2.048 5.12-4.608 7.68-7.168l10.24-10.24c7.168 5.632 16.384 13.312 27.136 23.552 30.208 28.672 82.944 86.016 128 138.752-56.32-41.984-118.784-92.16-151.552-122.88-9.216-8.192-15.872-15.872-21.504-22.016z" horiz-adv-x="1024" />
<glyph glyph-name="bianji1" unicode="&#58923;" d="M119.874 180.78v-148.976h149.005l431.385 435.265L551.207 616.04 119.874 180.78z m694.07 399.995c15.735 15.679 15.735 39.231 0 54.856l-90.124 90.238c-15.744 15.655-39.232 15.655-54.977 0l-70.592-70.596 149.057-149.03 66.635 74.532zM472.797 110.213l-78.41-78.41h509.737v78.41H472.798z" horiz-adv-x="1024" />
<glyph glyph-name="icon_yunxiazai" unicode="&#59112;" d="M790.528 486.4c-18.432 141.824-136.704 252.416-278.528 252.416S251.904 628.736 233.472 486.4C117.76 478.72 25.6 378.88 25.6 258.048c0-125.952 99.84-228.864 220.672-228.864h533.504c120.832 2.56 218.112 102.4 218.112 228.864C998.4 378.88 906.24 478.72 790.528 486.4z m-286.208-389.12l-194.56 223.232h131.584V528.384h125.952v-207.872h131.584l-194.56-223.232z" horiz-adv-x="1024" />
......
dist/static/js/0.36efd111876b5d861aa2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.3d2538496600f4a8c3ca.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.4862045aa248f4b63d74.js deleted 100644 → 0
webpackJsonp([20],{"5yix":function(e,t){},SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),n=i.n(s),a=i("lRwf"),o=i.n(a),r=i("zL8q"),c=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var l={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleChangeIndex:function(e,t){this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){this.operatorName(e)&&(e.edit=!0)},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("是否删除分组名称？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(c.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(c.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return n()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"},getRecommendList:function(){this.active=!0,this.currentIndex=-1,this.$emit("getRecommend")}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){return e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}]},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){return!i.type.indexOf("key")&&e._k(i.keyCode,"enter",13,i.key,"Enter")?null:e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"el-icon-edit icon-list icon-list-oper",on:{click:function(i){return e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){return e.deleteGroupName(t)}}})]):e._e()],1)}),0)]),e._v(" "),i("div",{staticClass:"recommend-list",class:{"recommend-active":e.active},on:{click:e.getRecommendList}},[e._v("\n 推荐会员分组\n ")]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:10,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(l,u,!1,function(e){i("5yix")},"data-v-7c704602",null);t.default=m.exports}});
\ No newline at end of file
dist/static/js/21.9ad10774440ae06517b7.js 0 → 100644
webpackJsonp([21],{BF0I:function(e,t){},SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),n=i.n(s),a=i("lRwf"),o=i.n(a),r=i("zL8q"),c=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var l={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleChangeIndex:function(e,t){this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){if(e.edit)this.modifyName(e);else{if(!this.operatorName(e))return;e.edit=!0}},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("是否删除分组名称？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(c.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(c.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return n()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"},getRecommendList:function(){this.active=!0,this.currentIndex=-1,this.$emit("getRecommend")}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){return e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}]},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){return!i.type.indexOf("key")&&e._k(i.keyCode,"enter",13,i.key,"Enter")?null:e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"icon-list icon-list-oper",class:[t.edit?"el-icon-check":"el-icon-edit"],on:{click:function(i){return e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){return e.deleteGroupName(t)}}})]):e._e()],1)}),0)]),e._v(" "),i("div",{staticClass:"recommend-list",class:{"recommend-active":e.active},on:{click:e.getRecommendList}},[e._v("\n 推荐会员分组\n ")]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:10,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(l,u,!1,function(e){i("BF0I")},"data-v-3ce9e6ed",null);t.default=m.exports}});
\ No newline at end of file
dist/static/js/manifest.b7aaaa4daefc7cdd16f8.js → dist/static/js/manifest.0aa436e3bf38abfe76a7.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var d,o,b,i=0,u=[];i<c.length;i++)o=c[i],n[o]&&u.push(n[o][0]),n[o]=0;for(d in t)Object.prototype.hasOwnProperty.call(t,d)&&(e[d]=t[d]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"3d2538496600f4a8c3ca",1:"eccd8c3c3d12ce4a6d73",2:"dd4fd4366dbfaac0e52c",3:"620684f049b9fc0c6801",4:"a68332939a6bfdfe4ea4",5:"bb9c9a780535735968e2",6:"156667a0d69e9b0f9b4c",7:"4ff29118928a011087de",8:"a7bfdf906c46bdc7024f",9:"ea583eedf0e8e01807bd",10:"2450ea09d03a6d56323f",11:"c4cc41d54f5a47d3eeab",12:"ff49b3face62ef7aef5f",13:"109c66b4d5044a2c65ce",14:"0550dbc2c960c90c548f",15:"d3bc927a69a035e8f788",16:"a75aeea0cbeabe55b8a6",17:"de3efb98ab1af91a17c7",18:"34b693a8bcc1f192dc0f",19:"308e228686726571bdcf",20:"4862045aa248f4b63d74",21:"6ddaf764c36ea996789e",22:"c4f40b36578f95b71d0e",23:"487d36d247e011d8b493",24:"ac711164a179b5d1a97d",25:"eecd859ab9c64de6928f",26:"5055355a4a84b9f2bd9d",27:"6d31a9ba97dcacb6a1f7",28:"3493abb67f82d7dbc1cb",29:"85349d1f36348906697c",32:"a9aaa6e5d01423c1a780"}[e]+".js";var d=setTimeout(o,12e4);function o(){f.onerror=f.onload=null,clearTimeout(d);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=o,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,t,f){for(var o,d,b,i=0,u=[];i<c.length;i++)d=c[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(a&&a(c,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var c={},n={33:0};function r(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,r){a=n[e]=[c,r]});a[2]=c;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"36efd111876b5d861aa2",1:"eccd8c3c3d12ce4a6d73",2:"dd4fd4366dbfaac0e52c",3:"2f800687a000c2635a63",4:"f21080634b532ec7e21b",5:"e8773950f9d2451f500b",6:"156667a0d69e9b0f9b4c",7:"4ff29118928a011087de",8:"a7bfdf906c46bdc7024f",9:"ea583eedf0e8e01807bd",10:"2450ea09d03a6d56323f",11:"64535a1b8e4613ff8f49",12:"ff49b3face62ef7aef5f",13:"109c66b4d5044a2c65ce",14:"0550dbc2c960c90c548f",15:"d3bc927a69a035e8f788",16:"a75aeea0cbeabe55b8a6",17:"de3efb98ab1af91a17c7",18:"34b693a8bcc1f192dc0f",19:"308e228686726571bdcf",20:"2b65704e386d6c480e4e",21:"9ad10774440ae06517b7",22:"c4f40b36578f95b71d0e",23:"487d36d247e011d8b493",24:"ac711164a179b5d1a97d",25:"eecd859ab9c64de6928f",26:"5055355a4a84b9f2bd9d",27:"6d31a9ba97dcacb6a1f7",28:"3493abb67f82d7dbc1cb",29:"85349d1f36348906697c",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),c},r.m=e,r.c=c,r.d=function(e,a,c){r.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},r.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(a,"a",a),a},r.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -569,6 +569,11 @@ export default {
data() {
return {
postTemplateData: {
selectedVal: [],
template: []
},
currentComputeType: '',
templateData: [],
id: '',
searchFlag: false,
......@@ -808,6 +813,9 @@ export default {
},
methods: {
async saveConfirm() {
await this.confirmPost();
},
/**
* 获取 templateData
*/
......@@ -859,7 +867,6 @@ export default {
let newTime = middleTemplate.time;
this.currentComputeType = templateVal.compute.computeType >> 0;
console.log(this.currentComputeType);
if (this.currentComputeType === 0 && !!templateVal.compute.computeWidgetId) {
this.getTemplateCodeById(templateVal.compute.computeWidgetId);
}
......
src/components/tagDetail/mixin/index.js
......@@ -14,6 +14,230 @@ export default {
that.baseUrl = host;
}
},
data() {
return {
currentComputeType:'',
// 标签详情数据
tagData: {
tagId: '',
tagName: '',
tagDescribe: '',
isActive: 0, // 是否实时
inputSearch: '' // 输入搜索
},
tag001: {
checkeditems: [],
isIndeterminate: false,
checkAll: false,
options: [
// {
// value: 1,
// key: '男'
// },
// {
// value: 2,
// key: '女'
// }
],
compute: 'in'
},
// 属于/不属于(计算控件)
tag002: {
computeRadio: 'in'
},
// 数字区间
tag003: {
numRange: ['', '']
},
// 时间属性-固定时段/最近
tag004: {
fixedRecentRadio: '1',
fixedRecentRangeValue: [],
fixedRecentTimeRecent: ''
},
// 最近 天
tag005: {
timeRecent: '',
timeType: 'lastday'
},
// 之后 天
tag006: {
timeAfter: '',
timeType: 'afterday'
},
// 添加输入值
tag007: {
addInputValue: '',
addTags: []
},
// 搜索下拉多选添加值
tag008: {
searchModel: [],
searchOptions: [
// {
// key: 1,
// value: '测试去1'
// }
],
addSelectTags: []
},
// 多选项( 全部选项/已选选项 )
tag009: {
allSelectActive: 'first',
inputSearch: '',
allSelectOptions: [
// {
// id: 1,
// check: false,
// name: '欧时力'
// },
// {
// id: 2,
// check: false,
// name: '伊芙丽'
// }
],
selectedOptions: []
},
// 多选项(城市选择) ( 全部选项/已选选项 )
tag010: {
citySelectActive: 'first',
isIndeterminateCity: false,
checkAllCity: false,
citySelectOptions: [
{
provinceId: 1,
check: false,
provinceName: '北京',
showCity: false,
children: [
{
cityId: 11,
cityName: '北京',
check: false
}
]
},
{
provinceId: 2,
check: false,
provinceName: '浙江',
showCity: false,
children: [
{
cityId: 21,
cityName: '杭州',
check: false
},
{
cityId: 22,
cityName: '温州',
check: false
}
]
}
],
checkeditemsCity: [], // 已选省
citySelectedOptions: []
},
// 门店选择器
tag011: {
// 门店选择器参数
uuid: '', // 新增传空，编辑必传
// 需要的下拉 默认为全部[0,1,2,3,4,5]
// 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
uuidOptions: [0, 1, 2, 3, 4, 5],
isAdd: true // 新增: true, 编辑: false
},
// 多范围()
tag012: {
selectOne: 'all',
selectTwo: 'in',
selectLabel: '曾经消费门店',
selectLabelTip: '注：存在其一即会员至少有一个字段值满足所选条件；所有即会员的所有字段值满足所选条件'
},
// 多选项值异步
tag013: {
checkeditems: [],
isIndeterminate: false,
checkAll: false,
options: [
// {
// value: 1,
// key: '男'
// },
// {
// value: 2,
// key: '女'
// }
]
},
// 时间属性-固定时段/相对时段 年月日-年月日+最近+之后
tag014: {
radio: '1',
dateRangeValue: [],
// 相对时间
timeRadio: '1', // 年月日
timeChecked: '1', //当 年月日 / 最近/之后
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: ''
},
// 时间属性- 月日-月日+最近+之后
tag015: {
radio: '1',
monthDayRange: [],
// 相对时间
timeRadio: '1', // 月日
timeChecked: '1', //当 月日 / 最近/之后
timeSelect: '1', // 最近/之后
timeInput: ''
},
// 时间属性- 年月日-年月日
tag016: {
dateRangeValue: []
},
// 时间属性- 年月日-年月日+最近
tag017: {
radio: '1',
dateRangeValue: [],
// 相对时间
timeRadio: '1', // 年月日
timeChecked: '1', //当 年月日 / 最近
// timeCheckedTwo: false,
timeSelect: '1', // 最近
timeInput: ''
},
// 时间属性- 年月日-年月日
tag019: {
radio: '1',
dateRangeValue: [],
// 相对时间
timeRadio: '1', // 年月日
timeChecked: '1', //当 年月日 / 最近/之后
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: ''
}
};
},
methods: {
/**
* 关闭
......@@ -101,10 +325,9 @@ export default {
/**
* 确定弹层
*/
confirmDialog: _debounce(function() {
const that = this;
that.confirmPost();
}, 500),
confirmDialog() {
this.confirmPost();
},
/* eslint-disable */
async confirmPost() {
const that = this;
......@@ -629,7 +852,6 @@ export default {
that.closeTagShortDialog();
// 如果来源是 会员标签编辑的时候
// if (that.fromFlag == 'memberGroup') {
console.log(this.tagData);
let sendObj = {
tagId: that.tagShortId || this.tagId,
tagValue: JSON.stringify(tagValue),
......@@ -1154,7 +1376,7 @@ export default {
if (!!newTemp) {
let newTempVal = newTemp.val[0];
let newTime = newTemp.time;
that.currentComputeType = parseInt(newTempVal.compute.computeType);
this.currentComputeType =newTempVal.compute.computeType >> 0;
// 计算控件
if (parseInt(newTempVal.compute.computeType) === 0 && !!newTempVal.compute.computeWidgetId) {
// setTimeout(function(){
......@@ -1166,7 +1388,7 @@ export default {
that.postCompute = newTempVal.compute.compute;
}
if (!!newTempVal.valWidgetId) {
setTimeout(function() {
setTimeout(_ => {
that.getTemplateCodeById(newTempVal.valWidgetId);
}, 50);
}
......@@ -1246,10 +1468,7 @@ export default {
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
console.log(error);
});
},
......@@ -1421,7 +1640,7 @@ export default {
/**
* 获取当前标签数据 --- api
*/
getTagData(tagId) {
async getTagData(tagId) {
const that = this;
that.searchFlag = false; // 默认不显示搜索框
const para = {
......@@ -1437,7 +1656,7 @@ export default {
that.tagData.isActive = resData.result.isActive;
that.tagData.tagType = resData.result.tagType;
// 获取 columnKey
// if (!!resData.result.columnKey) {
// if (!!resData.result.columnKey) {currentComputeType
that.currentKey = resData.result.columnKey;
// }else {
// that.currentKey = resData.result.tagId;
......@@ -1448,13 +1667,10 @@ export default {
}
return;
}
errMsg.errorMsg(resData);
// errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
console.log(error)
});
}
},
......
src/view/memberGroup/edit-tag.vue
......@@ -7,7 +7,7 @@
<p class="tag-desc">{{ tagData.tagDescribe }}</p>
<p v-if="tagData.tagId" class="m-t-20 m-b-20">标签值设置</p>
<!-- 所有标签的配置项 -->
<tag-config-options v-if="tagData.tagId" :tagId="tagData.tagId" ref="tagConfig"></tag-config-options>
<tag-config-options v-if="tagData.tagId" :tagId="tagData.tagId" ref="tagConfig" @returnTagData="returnTagData"></tag-config-options>
<p>营销方式</p>
<tag-mode></tag-mode>
</div>
......@@ -22,7 +22,7 @@
<script>
import TagMode from '@/components/tag/tag-mode';
import TagConfigOptions from '@/components/tag/tag-config-options';
import tagDetails from '@/components/tagDetail/mixin/index';
// import tagDetails from '@/components/tagDetail/mixin/index';
export default {
name: 'edit-tag',
......@@ -48,7 +48,7 @@ export default {
templateData: []
};
},
mixins: [tagDetails],
// mixins: [tagDetails],
methods: {
handleClose() {
this.$emit('update:showEditTagPop', false);
......@@ -57,9 +57,12 @@ export default {
const ret = this.$refs.tagConfig.getTemplateData();
this.templateData = JSON.parse(JSON.stringify(ret));
this.tagId = this.tagData.tagId;
this.confirmPost().then(_ => {
this.$refs.tagConfig.saveConfirm().then(_ => {
this.$emit('update:showEditTagPop', false);
});
},
returnTagData(list) {
this.$emit('returnTagData', list);
}
}
};
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -22,7 +22,7 @@
</el-form-item>
<el-form-item label="" prop="groupName" class="w-220">
<div>分组名称</div>
<el-input class="w-220" v-model="ruleForm.groupName" @input.native="e => toInput(e, 'groupName')"> </el-input>
<el-input class="w-220" v-model="ruleForm.groupName" placeholder="请输入分组名称" @input.native="e => toInput(e, 'groupName')"> </el-input>
<label class="input-label">{{ ruleForm.groupNameLength }}/10</label>
</el-form-item>
<el-form-item label="" prop="effectiveDateTmp">
......@@ -315,8 +315,13 @@ export default {
},
// 保存选择的标签数据
returnTagData(data) {
console.log(data);
let tagParams = JSON.parse(data.tagParams);
data.newTagVal = JSON.stringify(tagParams.selectedVal);
data.level = this.activeTagsGroupIndex;
data.levelType = this.ruleForm.tagsGroupRelation[this.activeTagsGroupIndex] ? this.ruleForm.tagsGroupRelation[this.activeTagsGroupIndex] : 'or';
switch (this.editPopType) {
case 'add':
this.ruleForm.selectedTags[this.activeTagsGroupIndex].push(data);
......@@ -400,6 +405,10 @@ export default {
postSave() {
let ruleForm = this.ruleForm;
this.checkRealTime();
console.log(this.ruleForm.isActive);
return;
const para = {
memberTagGroupId: ruleForm.memberTagGroupId,
groupName: ruleForm.groupName,
......@@ -645,4 +654,9 @@ export default {
}
}
}
.page-box {
float: right;
margin-top: 20px;
margin-right: 20px;
}
</style>
src/view/platformTag/member-tag.vue
......@@ -69,7 +69,7 @@
</div>
<div class="form-item">
<label for="">分组有效期</label>
<el-date-picker v-model="tagConfig.date" value-format="yyyy-MM-dd HH:MM:SS" type="date" placeholder="选择日期"> </el-date-picker>
<el-date-picker v-model="tagConfig.date" :picker-options="pickerOptions" value-format="yyyy-MM-dd HH:MM:SS" type="date" placeholder="选择日期"> </el-date-picker>
</div>
<div class="form-item">
<label for="">分组描述</label>
......@@ -139,6 +139,11 @@ export default {
groupShow: false,
selectedTags: [[]],
tagsGroupRelation: [],
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now();
}
},
// 面包屑参数
navpath: [
{
......@@ -239,26 +244,32 @@ export default {
}, []);
let newActiveArr = arr.map(el => el.isActive);
// 0 非实时 1 实时
this.tagConfig.isRealTime = newActiveArr.indexOf(0) > -1 ? 0 : 1;
},
createNewGroup() {
this.checkRealTime();
console.log(this.tagConfig.isRealTime);
console.log(this.selectedTags);
return;
const param = {
groupName: this.tagConfig.groupName,
isRealTime: this.tagConfig.isRealTime,
describle: this.tagConfig.describle,
describle: this.tagConfig.textarea,
updateType: this.tagConfig.updateType,
updateDay: this.tagConfig.updateDay,
// effectiveStatus: '',
effectiveStatus: 1,
requestProject: 'gic-member-tag-web',
json: JSON.stringify(this.selectedTags),
effectiveDateTmp: this.tagConfig.date
};
console.log(param);
addNewGroup(param)
.then(res => {
if (res.errorCode == 1) {
// console.log(res);
this.$router.push({ path: 'memberGroupList' });
}
})
.catch(err => {
......@@ -271,8 +282,11 @@ export default {
// }
},
returnTagData(tagData) {
console.log(tagData);
let tagParams = JSON.parse(tagData.tagParams);
tagData.newTagVal = JSON.stringify(tagParams.selectedVal);
tagData.level = this.activeTagsGroupIndex;
tagData.levelType = this.tagsGroupRelation[this.activeTagsGroupIndex] ? this.tagsGroupRelation[this.activeTagsGroupIndex] : 'or';
switch (this.editPopType) {
case 'add':
this.selectedTags[this.activeTagsGroupIndex].push(tagData);
......@@ -417,6 +431,14 @@ export default {
beforeMount() {
// 一二三级都需要一个变量来保存自己的信息 在切换页码和数量的时候也要传参数过去
this.middleWareVariable = {};
this.tagConfig = {
groupName: '',
isRealTime: '',
textarea: '',
updateType: '',
updateDay: '',
date: ''
};
this.handTag = null;
this.groupId = '';
this.getTagList();
......
src/view/platformTag/tag-container.vue
......@@ -55,7 +55,8 @@ export default {
data() {
return {
tableData: []
tableData: [],
tagData: {}
};
},
......
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