Skip to content

M
marketing
You need to sign in or sign up before continuing.
Commit 532433a7 by zhangmeng
Options

修改样式

parent f3c0f334
Showing with 317 additions and 149 deletions
dist.zip 0 → 100644
File added
dist/index.html
<!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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.caedf67985e9c730a9b2ae33e3b5a953.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.da716d11024428d6687c.js></script><script type=text/javascript src=/marketing/static/js/app.4d5612a16bd51659e0e9.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/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.79a4535b9a2c45626246631a441c3308.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.da716d11024428d6687c.js></script><script type=text/javascript src=/marketing/static/js/app.da3601c1b34ebaf6265e.js></script></body></html>
\ No newline at end of file
dist/static/img/iconfont.84b94df.svg → dist/static/img/iconfont.40fcd41.svg
......@@ -170,6 +170,9 @@ Created by iconfont
<glyph glyph-name="hudong" unicode="&#58894;" d="M456.3 798.2h-323c-19.3 0-35-15.7-35-35v-258.6c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32V766.2c-0.1 17.7-14.4 32-32.1 32z m-8-285.6h-310V758.2h310.1v-245.6zM895.7 294.5H572.6c-19.3 0-35-15.7-35-35v-259c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32v262c0 17.6-14.4 32-32 32z m-8-286H577.6v246h310.1v-246zM759.4 670c45.6-53.4 72-123.4 72.6-192.2h-53.2c-2.4 0-3.7-2.9-2.1-4.7l73.2-82.1c1.1-1.2 3.1-1.2 4.2 0l73.2 82.1c1.6 1.8 0.3 4.7-2.1 4.7H872c-0.6 78.2-30.4 157.6-82.2 218.2-26.2 30.7-56.4 54.9-89.8 72.1-35.6 18.3-73 27.6-111.3 27.6v-40c62.9 0 123.5-30.5 170.7-85.7zM265.6 94.3c-45.6 53.4-72 123.4-72.6 192.2h53.2c2.4 0 3.7 2.9 2.1 4.7l-73.2 82.1c-1.1 1.2-3.1 1.2-4.2 0l-73.2-82.1c-1.6-1.8-0.3-4.7 2.1-4.7H153c0.6-78.2 30.4-157.6 82.2-218.2 26.2-30.7 56.4-54.9 89.8-72.1 35.6-18.3 73-27.6 111.3-27.6v40c-62.9 0-123.5 30.4-170.7 85.7z" horiz-adv-x="1024" />
<glyph glyph-name="yuyin" unicode="&#58960;" d="M262.023529 377.976471m-90.352941 0a90.352941 90.352941 0 1 1 180.705883 0 90.352941 90.352941 0 1 1-180.705883 0ZM677.647059 790.588235c-27.105882 27.105882-57.223529 51.2-90.352941 72.282353-21.082353 15.058824-48.188235 9.035294-63.247059-12.047059s-9.035294-48.188235 12.047059-63.247058c27.105882-18.070588 51.2-39.152941 75.294117-63.247059 93.364706-93.364706 144.564706-216.847059 144.564706-352.376471 0-132.517647-54.211765-259.011765-144.564706-352.37647-24.094118-24.094118-48.188235-45.176471-75.294117-63.247059-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 33.129412 21.082353 63.247059 45.176471 90.352941 72.282353 108.423529 108.423529 171.670588 256 171.670588 415.623529 0 165.647059-63.247059 313.223529-171.670588 421.647059zM508.988235 621.929412c-15.058824 15.058824-33.129412 30.117647-51.2 42.164706-24.094118 15.058824-51.2 9.035294-66.258823-12.047059-15.058824-21.082353-9.035294-48.188235 12.047059-63.247059 15.058824-9.035294 27.105882-21.082353 39.152941-33.129412 48.188235-48.188235 75.294118-111.435294 75.294117-180.705882s-27.105882-132.517647-75.294117-180.705882c-12.047059-12.047059-24.094118-21.082353-39.152941-33.129412-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 18.070588 12.047059 36.141176 27.105882 51.2 42.164706 63.247059 63.247059 102.4 150.588235 102.4 243.952941s-36.141176 183.717647-99.388236 249.976471z" horiz-adv-x="1024" />
<glyph glyph-name="record-actice" unicode="&#58994;" d="M125.8 350.29999999999995V676c0 47 30.7 83.7 77.2 90.4 15.5 1.8 31.2 1.9 46.8 0.5 14.8-1 25.5-15.4 24.8-30.5-0.6-15.3-12.8-27.6-28.1-28.4-9.9-0.3-19.8 0-29.6-0.1-19.1-0.3-31.6-12.8-31.6-32v-651.4c0-19.6 12.6-32.1 32.1-32.1h591.5c20.1 0 32.3 12.4 32.4 33.2V204.89999999999998l0.1 468.5c0.6 8.1-1.6 16.1-6.2 22.8a29.27 29.27 0 0 1-23.5 11.8c-9.8 0.2-19.8 0-29.6 0.1-16.5-0.2-30.1 12.9-30.4 29.4-0.1 7.9 3 15.6 8.5 21.2 5.6 5.6 13.2 8.8 21.1 8.7 17.1-0.2 34.5 0.6 50.9-2.8 39.3-8.1 67.1-43.4 68.5-83.3l0.1-6.8v-648.3c0-39.1-17.5-67.8-52.7-85.1-11.6-5.5-24.3-8.2-37.1-8H215.8c-24-0.2-47.1 9.2-64 26.2s-26.3 40.1-26 64.1V350.29999999999995z m0 0M692 765.9c0 35.5-25.6 61.1-61.2 61.1H395.9c-36 0-61.3-25.4-61.4-61.4-0.1-18.2-0.1-36.3-0.1-54.5 0.1-37.7 25.1-62.7 62.8-62.7h116.2c40 0.1 79.9-0.3 119.8 0.1 15.8 0 30.9 6.4 41.9 17.6 11.1 11.3 17.1 26.5 16.8 42.2 0.3 19.3 0.2 38.5 0.1 57.6z m-59.8-57.6H394.5V767h237.7v-58.7zM658.7 333.5c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.7 7.1 17.1 0 6.4-2.5 12.5-7.1 17-4.8 4.8-11.2 7.5-18.1 7.5H538.9l-0.1 0.7 137.5 137.5c4.8 4.8 7.5 11.2 7.5 18 0 6.5-2.5 12.6-7 17.1-4.5 4.5-10.6 7-17.1 7-6.8 0-13.2-2.7-18.1-7.5L515 428.7 388.4 555.3c-4.8 4.9-11.2 7.5-18 7.5-6.5 0-12.6-2.5-17.1-7-4.5-4.5-7.1-10.6-7.1-17.1 0-6.8 2.7-13.2 7.6-18l136.7-135.5v-2.7H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-59.2H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-83.1c0-13.9 11-25.1 24.5-25.1s24.5 11.3 24.5 25.1v83.1h119.1c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.6 7.1 17s-2.5 12.4-7.1 17.1c-4.8 4.8-11.2 7.5-18.1 7.5H539.5v59.2h119.2z" horiz-adv-x="1024" />
......@@ -332,6 +335,9 @@ Created by iconfont
<glyph glyph-name="saomiao" unicode="&#58974;" d="M138.666667 512c-17.6 0-32 14.4-32 32V725.333333c0 35.2 28.8 64 64 64h224c17.6 0 32-14.4 32-32s-14.4-32-32-32H170.666667v-181.333333c0-17.6-14.4-32-32-32zM394.666667-21.333333H170.666667c-35.2 0-64 28.8-64 64v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333h224c17.6 0 32-14.4 32-32s-14.4-32-32-32zM885.333333 512c-17.6 0-32 14.4-32 32V725.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224c35.2 0 64-28.8 64-64v-181.333333c0-17.6-14.4-32-32-32zM853.333333-21.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333c0-35.2-28.8-64-64-64zM885.333333 352H138.666667c-17.6 0-32 14.4-32 32s14.4 32 32 32h746.666666c17.6 0 32-14.4 32-32s-14.4-32-32-32z" horiz-adv-x="1024" />
<glyph glyph-name="shipin1" unicode="&#58917;" d="M512 896C229.376 896 0 666.624 0 384s229.376-512 512-512 512 229.376 512 512S794.624 896 512 896z m0-965.632c-250.368 0-453.632 203.264-453.632 453.632 0 250.368 203.264 453.632 453.632 453.632s453.632-203.264 453.632-453.632-203.264-453.632-453.632-453.632zM723.968 447.488L460.8 599.552c-10.752 6.144-23.552 9.728-36.352 9.728-40.448 0-73.216-32.768-72.704-73.216v-304.128c-0.512-26.112 13.312-50.688 36.352-63.488 10.752-6.144 23.552-9.728 36.352-9.728s25.088 3.584 36.352 9.728l263.168 152.576c10.752 6.144 19.968 15.36 26.624 26.624 20.48 34.816 8.192 79.872-26.624 99.84z" horiz-adv-x="1024" />
<glyph glyph-name="jifenmingxibiao" unicode="&#59206;" d="M1199.104 885.248H527.36c-91.136 0-165.376-74.24-165.376-165.376v-671.744c0-87.04 67.584-158.72 153.088-164.864v-0.512h684.032c91.136 0 165.376 74.24 165.376 165.376V719.872c0 91.136-74.24 165.376-165.376 165.376z m86.528-184.32v-631.296c0-58.368-47.616-105.984-105.984-105.984H546.304c-58.368 0-105.984 47.616-105.984 105.984V700.928c0 58.368 47.616 105.984 105.984 105.984h633.344c58.368 0 105.984-47.616 105.984-105.984zM760.832 523.776H1116.16c24.576 0 45.056 19.968 45.056 45.056 0 24.576-19.968 45.056-45.056 45.056h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056zM610.304 173.056m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM610.304 370.688m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM1116.16 415.744h-355.328c-24.576 0-45.056-19.968-45.056-45.056 0-24.576 19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM1116.16 217.6h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM610.304 568.832m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0Z" horiz-adv-x="1637" />
......
dist/static/js/app.4d5612a16bd51659e0e9.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/app.da3601c1b34ebaf6265e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/iconfont/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/iconfont/iconfont.svg
......@@ -170,6 +170,9 @@ Created by iconfont
<glyph glyph-name="hudong" unicode="&#58894;" d="M456.3 798.2h-323c-19.3 0-35-15.7-35-35v-258.6c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32V766.2c-0.1 17.7-14.4 32-32.1 32z m-8-285.6h-310V758.2h310.1v-245.6zM895.7 294.5H572.6c-19.3 0-35-15.7-35-35v-259c0-17.6 14.4-32 32-32h326.1c17.6 0 32 14.4 32 32v262c0 17.6-14.4 32-32 32z m-8-286H577.6v246h310.1v-246zM759.4 670c45.6-53.4 72-123.4 72.6-192.2h-53.2c-2.4 0-3.7-2.9-2.1-4.7l73.2-82.1c1.1-1.2 3.1-1.2 4.2 0l73.2 82.1c1.6 1.8 0.3 4.7-2.1 4.7H872c-0.6 78.2-30.4 157.6-82.2 218.2-26.2 30.7-56.4 54.9-89.8 72.1-35.6 18.3-73 27.6-111.3 27.6v-40c62.9 0 123.5-30.5 170.7-85.7zM265.6 94.3c-45.6 53.4-72 123.4-72.6 192.2h53.2c2.4 0 3.7 2.9 2.1 4.7l-73.2 82.1c-1.1 1.2-3.1 1.2-4.2 0l-73.2-82.1c-1.6-1.8-0.3-4.7 2.1-4.7H153c0.6-78.2 30.4-157.6 82.2-218.2 26.2-30.7 56.4-54.9 89.8-72.1 35.6-18.3 73-27.6 111.3-27.6v40c-62.9 0-123.5 30.4-170.7 85.7z" horiz-adv-x="1024" />
<glyph glyph-name="yuyin" unicode="&#58960;" d="M262.023529 377.976471m-90.352941 0a90.352941 90.352941 0 1 1 180.705883 0 90.352941 90.352941 0 1 1-180.705883 0ZM677.647059 790.588235c-27.105882 27.105882-57.223529 51.2-90.352941 72.282353-21.082353 15.058824-48.188235 9.035294-63.247059-12.047059s-9.035294-48.188235 12.047059-63.247058c27.105882-18.070588 51.2-39.152941 75.294117-63.247059 93.364706-93.364706 144.564706-216.847059 144.564706-352.376471 0-132.517647-54.211765-259.011765-144.564706-352.37647-24.094118-24.094118-48.188235-45.176471-75.294117-63.247059-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 33.129412 21.082353 63.247059 45.176471 90.352941 72.282353 108.423529 108.423529 171.670588 256 171.670588 415.623529 0 165.647059-63.247059 313.223529-171.670588 421.647059zM508.988235 621.929412c-15.058824 15.058824-33.129412 30.117647-51.2 42.164706-24.094118 15.058824-51.2 9.035294-66.258823-12.047059-15.058824-21.082353-9.035294-48.188235 12.047059-63.247059 15.058824-9.035294 27.105882-21.082353 39.152941-33.129412 48.188235-48.188235 75.294118-111.435294 75.294117-180.705882s-27.105882-132.517647-75.294117-180.705882c-12.047059-12.047059-24.094118-21.082353-39.152941-33.129412-21.082353-15.058824-27.105882-42.164706-12.047059-63.247059 15.058824-21.082353 42.164706-27.105882 63.247059-12.047059 18.070588 12.047059 36.141176 27.105882 51.2 42.164706 63.247059 63.247059 102.4 150.588235 102.4 243.952941s-36.141176 183.717647-99.388236 249.976471z" horiz-adv-x="1024" />
<glyph glyph-name="record-actice" unicode="&#58994;" d="M125.8 350.29999999999995V676c0 47 30.7 83.7 77.2 90.4 15.5 1.8 31.2 1.9 46.8 0.5 14.8-1 25.5-15.4 24.8-30.5-0.6-15.3-12.8-27.6-28.1-28.4-9.9-0.3-19.8 0-29.6-0.1-19.1-0.3-31.6-12.8-31.6-32v-651.4c0-19.6 12.6-32.1 32.1-32.1h591.5c20.1 0 32.3 12.4 32.4 33.2V204.89999999999998l0.1 468.5c0.6 8.1-1.6 16.1-6.2 22.8a29.27 29.27 0 0 1-23.5 11.8c-9.8 0.2-19.8 0-29.6 0.1-16.5-0.2-30.1 12.9-30.4 29.4-0.1 7.9 3 15.6 8.5 21.2 5.6 5.6 13.2 8.8 21.1 8.7 17.1-0.2 34.5 0.6 50.9-2.8 39.3-8.1 67.1-43.4 68.5-83.3l0.1-6.8v-648.3c0-39.1-17.5-67.8-52.7-85.1-11.6-5.5-24.3-8.2-37.1-8H215.8c-24-0.2-47.1 9.2-64 26.2s-26.3 40.1-26 64.1V350.29999999999995z m0 0M692 765.9c0 35.5-25.6 61.1-61.2 61.1H395.9c-36 0-61.3-25.4-61.4-61.4-0.1-18.2-0.1-36.3-0.1-54.5 0.1-37.7 25.1-62.7 62.8-62.7h116.2c40 0.1 79.9-0.3 119.8 0.1 15.8 0 30.9 6.4 41.9 17.6 11.1 11.3 17.1 26.5 16.8 42.2 0.3 19.3 0.2 38.5 0.1 57.6z m-59.8-57.6H394.5V767h237.7v-58.7zM658.7 333.5c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.7 7.1 17.1 0 6.4-2.5 12.5-7.1 17-4.8 4.8-11.2 7.5-18.1 7.5H538.9l-0.1 0.7 137.5 137.5c4.8 4.8 7.5 11.2 7.5 18 0 6.5-2.5 12.6-7 17.1-4.5 4.5-10.6 7-17.1 7-6.8 0-13.2-2.7-18.1-7.5L515 428.7 388.4 555.3c-4.8 4.9-11.2 7.5-18 7.5-6.5 0-12.6-2.5-17.1-7-4.5-4.5-7.1-10.6-7.1-17.1 0-6.8 2.7-13.2 7.6-18l136.7-135.5v-2.7H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-59.2H371.4c-6.9 0-13.3-2.6-18.1-7.5-4.6-4.6-7.1-10.7-7.1-17 0-13.5 11.3-24.5 25.2-24.5h119.1v-83.1c0-13.9 11-25.1 24.5-25.1s24.5 11.3 24.5 25.1v83.1h119.1c6.9 0 13.3 2.6 18.1 7.4 4.6 4.6 7.1 10.6 7.1 17s-2.5 12.4-7.1 17.1c-4.8 4.8-11.2 7.5-18.1 7.5H539.5v59.2h119.2z" horiz-adv-x="1024" />
......@@ -332,6 +335,9 @@ Created by iconfont
<glyph glyph-name="saomiao" unicode="&#58974;" d="M138.666667 512c-17.6 0-32 14.4-32 32V725.333333c0 35.2 28.8 64 64 64h224c17.6 0 32-14.4 32-32s-14.4-32-32-32H170.666667v-181.333333c0-17.6-14.4-32-32-32zM394.666667-21.333333H170.666667c-35.2 0-64 28.8-64 64v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333h224c17.6 0 32-14.4 32-32s-14.4-32-32-32zM885.333333 512c-17.6 0-32 14.4-32 32V725.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224c35.2 0 64-28.8 64-64v-181.333333c0-17.6-14.4-32-32-32zM853.333333-21.333333h-224c-17.6 0-32 14.4-32 32s14.4 32 32 32h224v181.333333c0 17.6 14.4 32 32 32s32-14.4 32-32v-181.333333c0-35.2-28.8-64-64-64zM885.333333 352H138.666667c-17.6 0-32 14.4-32 32s14.4 32 32 32h746.666666c17.6 0 32-14.4 32-32s-14.4-32-32-32z" horiz-adv-x="1024" />
<glyph glyph-name="shipin1" unicode="&#58917;" d="M512 896C229.376 896 0 666.624 0 384s229.376-512 512-512 512 229.376 512 512S794.624 896 512 896z m0-965.632c-250.368 0-453.632 203.264-453.632 453.632 0 250.368 203.264 453.632 453.632 453.632s453.632-203.264 453.632-453.632-203.264-453.632-453.632-453.632zM723.968 447.488L460.8 599.552c-10.752 6.144-23.552 9.728-36.352 9.728-40.448 0-73.216-32.768-72.704-73.216v-304.128c-0.512-26.112 13.312-50.688 36.352-63.488 10.752-6.144 23.552-9.728 36.352-9.728s25.088 3.584 36.352 9.728l263.168 152.576c10.752 6.144 19.968 15.36 26.624 26.624 20.48 34.816 8.192 79.872-26.624 99.84z" horiz-adv-x="1024" />
<glyph glyph-name="jifenmingxibiao" unicode="&#59206;" d="M1199.104 885.248H527.36c-91.136 0-165.376-74.24-165.376-165.376v-671.744c0-87.04 67.584-158.72 153.088-164.864v-0.512h684.032c91.136 0 165.376 74.24 165.376 165.376V719.872c0 91.136-74.24 165.376-165.376 165.376z m86.528-184.32v-631.296c0-58.368-47.616-105.984-105.984-105.984H546.304c-58.368 0-105.984 47.616-105.984 105.984V700.928c0 58.368 47.616 105.984 105.984 105.984h633.344c58.368 0 105.984-47.616 105.984-105.984zM760.832 523.776H1116.16c24.576 0 45.056 19.968 45.056 45.056 0 24.576-19.968 45.056-45.056 45.056h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056zM610.304 173.056m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM610.304 370.688m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0ZM1116.16 415.744h-355.328c-24.576 0-45.056-19.968-45.056-45.056 0-24.576 19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM1116.16 217.6h-355.328c-24.576 0-45.056-19.968-45.056-45.056s19.968-45.056 45.056-45.056H1116.16c24.576 0 45.056 19.968 45.056 45.056s-20.48 45.056-45.056 45.056zM610.304 568.832m-45.056 0a45.056 45.056 0 1 1 90.112 0 45.056 45.056 0 1 1-90.112 0Z" horiz-adv-x="1637" />
......
src/assets/style/base/index.scss
......@@ -137,6 +137,7 @@
height: 40px;
line-height: 40px;
border: 1px dashed #e4e7ed;
border-radius: 2px;
text-align: center;
margin:10px 0;
cursor: pointer;
......@@ -145,3 +146,62 @@
color:#1890ff;
}
}
.sync-imgtext__dialog{
.el-dialog__body{
padding:0 20px 30px;
}
}
.left-aside-contain {
/deep/ .el-submenu__title:hover {
background-color: #020b21;
}
}
.el-menu.el-menu--popup {
background: #020b21;
border-radius: 4px;
}
/* 左侧菜单 */
.leftBar-wrap .el-menu{
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item .el-submenu__title,.leftBar-wrap .cardmenu-item .el-menu-item,.leftBar-wrap .cardmenu-item .el-submenu .el-menu-item{
height: 40px;
line-height: 40px;
}
.leftBar-wrap .el-submenu__title:hover {
background-color: #020b21;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover i{
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-menu-item:hover span{
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover i{
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu:hover span{
/*background-color: #409EFF;*/
color: #fff;
}
.leftBar-wrap .cardmenu-item li.el-submenu .el-menu-item:hover label{
/*background-color: #409EFF;*/
color: #fff;
cursor: pointer;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title i{
color: #fff;
}
.leftBar-wrap .cardmenu-item .el-submenu.is-active div.el-submenu__title span{
color: #fff;
}
.el-menu.el-menu--popup .el-menu-item.is-active label {
color: #fff;
}
src/assets/style/components/index.scss
......@@ -132,7 +132,7 @@
left: 200px;
}
.el-button+.el-button {
margin-left: 7px;
margin-left: 5px;
}
}
.dm-tabs-wrap{
......@@ -141,7 +141,7 @@
}
}
.el-select,.el-input,.el-checkbox.is-bordered,.el-date-editor{
margin-right: 4px;
margin-right: 5px;
}
.el-form-item__margin-top14 {
......
src/assets/theme.zip
No preview for this file type
src/assets/theme/index.css
......@@ -44391,26 +44391,21 @@
/* 进行中 闪动效果 */
.dm-status--primary--flash {
position: relative;
}
.dm-status--primary--flash::before {
background-color: #1890FF;
border: 1px solid #fff;
box-shadow: 1px,1px,1px,rgba(0,0,0);
box-shadow: 1px 1px 0px #1890FF, -1px -1px 0px #1890FF, -1px 1px 0px #1890FF, 1px -1px 0px #1890FF;
width: 3px;
height: 3px;
display: inline-block;
vertical-align: middle;
border-radius: 50%;
-webkit-animation: antStatusProcessing 1.2s ease-in-out infinite;
animation: antStatusProcessing 1.2s ease-in-out infinite;
background: #1890FF;
width: 6px;
height: 6px;
margin-right: 7px;
}
/* .dm-status--primary--flash::after {
.dm-status--primary--flash::before {
content: ' ';
display: inline-block;
position: absolute;
left: -1px;
top: 5px;
top: -1px;
width: 6px;
height: 6px;
vertical-align: middle;
......@@ -44418,7 +44413,7 @@
border: 1px solid #1890FF;
-webkit-animation: antStatusProcessing 1.2s ease-in-out infinite;
animation: antStatusProcessing 1.2s ease-in-out infinite;
} */
}
@-webkit-keyframes antStatusProcessing {
0% {
src/components/layout/index.vue
......@@ -2,8 +2,8 @@
<div class="layout-container">
<vue-gic-header class="user-header-pop" style="z-index: 1999;" :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTagHandler" @toRouterView="toRouterView"></vue-gic-header>
<div class="layout">
<vue-gic-aside-menu v-if="asideShow" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag.sync="collapseFlag"></vue-gic-aside-menu>
<div class="layout-right">
<vue-gic-aside-menu class="layout-left" v-if="asideShow" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag.sync="collapseFlag"></vue-gic-aside-menu>
<div class="layout-right" :class="[{'asideShow': asideShow},{'collapseFlag':asideShow && collapseFlag}]">
<div class="layout-title">
<el-breadcrumb class="dm-breadcrumb" separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
......@@ -48,6 +48,11 @@
return this.$store.state.marketing.breadcrumb;
}
},
// watch:{
// asideShow(val) {
// this.collapseFlag = this.asideShow;
// }
// },
methods: {
// 处理路由跳转
toRouterView(val) {
......@@ -94,6 +99,13 @@
overflow-y: hidden;
margin-top: 64px;
width: 100%;
&-left {
width: 200px;
display: inline-block;
position: fixed;
left: 0;
z-index: 9;
}
&-right{
flex: 1;
overflow-x:auto;
......@@ -102,8 +114,17 @@
-webkit-transition: width 0.5s;
-o-transition: width 0.5s;
height: 100%;
width: 1200px;
overflow-y: auto;
margin-left:0px;
min-width: 1400px;
&.asideShow{
min-width: 1200px;
margin-left: 200px;
}
&.collapseFlag{
min-width: 1336px;
margin-left: 64px;
}
}
&-title{
height:85px;
......
src/components/libs/audioTemp/audioItem.vue
......@@ -2,9 +2,11 @@
<el-col :span="6" >
<div class="audio-item">
<div class="audio-item_top clearfix">
<img class="fl" src="../../../assets/img/voice_img.png" alt="" srcset="">
<div class="fl">
<h5 class="ellipsis-100">{{audioData.titleName || '未命名语音'}}</h5>
<div class="audio-item_top__img fl" >
<i class="iconfont icon-yuyin"></i>
</div>
<div class="audio-item_top__desc fl">
<h5 class="audio-item__title ellipsis-l2">{{audioData.titleName || '未命名语音'}}</h5>
<p class="gray fz12 ellipsis-100">创建于:{{audioData.createTimeStr}}</p>
</div>
</div>
......@@ -44,33 +46,56 @@ export default {
@import '../../../assets/style/base/var.scss';
.audio-item{
border: 1px solid #e4e7ed;
max-height: 111px;
border-radius: 2px;
max-height: 150px;
overflow: hidden;
margin-bottom:20px;
background:#fff;
&:hover{
border: 1px solid #1890ff;
box-shadow: 0 2px 8px rgba(0,0,0,.15);
}
&_top{
padding:10px;
&>div{
padding-left: 15px;
padding:24px;
&__desc{
padding-left: 16px;
line-height: 20px;
width: calc(100% - 88px);
}
&__img{
width:60px ;
height: 60px;
background: #b9c7db;
text-align: center;
margin-right: 10px;
i {
line-height: 60px;
color: rgba(255, 255, 255, 0.8);
font-size: 30px;
}
}
}
&__title{
height: 40px;
}
&_bottom {
display: flex;
justify-content: space-around;
align-items: center;
height: 30px;
background: $gray-color;
border-top: 1px solid $border-color;
height: 40px;
background: #f7f9fa;
border-top: 1px solid #e4e7ed;
cursor: pointer;
i{
font-size: 16px;
color:#909399;
&:hover{
color: #1890ff;
}
&.el-icon-delete{
&:hover{
color: $danger-color;
}
}
}
}
}
......
src/components/libs/audioTemp/index.vue
......@@ -15,7 +15,7 @@
<img class="block block-center pt100" width="60" height="60" src="../../../assets/img/no-data_icon.png" alt="">
<el-button class="block block-center mt10" type="text" @click="add">新增语音</el-button>
</div>
<el-pagination v-show="audioList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<!-- <el-pagination v-show="audioList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination> -->
<dm-audio-dialog :show.sync="audioDialogShow" :voiceId="currentVoiceId" @refresh="loadAudioList"></dm-audio-dialog>
</section>
</template>
......@@ -34,7 +34,7 @@ export default {
audioList:[],
listParams:{
currentPage:1,
pageSize:20
pageSize:999
},
total:1,
loading:false,
......@@ -93,11 +93,11 @@ export default {
<style lang="scss" scoped>
.lib-audio__list{
width:100%;
padding:20px;
padding: 20px 4px 20px 24px;
}
.lib-audio--add{
border: 1px dashed #e4e7ed;
height: 111px;
height: 148px;
overflow: hidden;
margin-bottom:20px;
background:#fff;
......@@ -108,7 +108,7 @@ export default {
color: #1890ff;
}
i{
line-height:111px;
line-height:148px;
font-size:16px;
vertical-align:middle;
}
......
src/components/libs/imgTemp/imgItem.vue
......@@ -76,6 +76,7 @@ export default {
margin: 20px 10px 0 10px;
float: left;
border: 1px solid #e4e7ed;
border-radius: 2px;
overflow: hidden;
cursor: pointer;
&:hover{
......
src/components/libs/imgTemp/imgItemRadio.vue
......@@ -43,6 +43,7 @@ export default {
margin: 20px 10px 0 10px;
float: left;
border: 1px solid #e4e7ed;
border-radius: 2px;
overflow: hidden;
cursor: pointer;
&:hover{
......
src/components/libs/imgTemp/index-box.vue
......@@ -164,12 +164,12 @@ export default {
@import '../../../assets/style/mixin/index.scss';
.dm-ilib{
border: 1px solid $border-color;
border-radius: 4px;
border-radius: 2px;
&>article{
position:relative;
width: calc(80% - 1px);
border-left: 1px solid $border-color;
border-radius:0 4px 4px 0;
border-radius:0 2px 2px 0;
min-height:573px;
// border-bottom: 1px solid $border-color;
.dm-ilib-header{
......@@ -192,6 +192,7 @@ export default {
}
.img-item__wrap {
min-height: 456px;
margin-left: 6px;
}
&>nav{
width: 20%;
......
src/components/libs/imgTemp/index.vue
......@@ -285,6 +285,7 @@ export default {
}
.img-item__wrap {
min-height: 456px;
margin-left: 6px;
}
&>nav{
flex:200px;
......
src/components/libs/imgTextTemp/syncImgtext.vue
<template>
<el-dialog title="同步微信图文" :visible.sync="show" width="30%" :before-close="close" v-loading="loading">
<div class="gic-modal-bd text-center">
<div class="gic-modal-content">
<p class="fz16" style="margin-bottom:20px">微信图文共<span> {{count}} </span>条<span @click="getSyncInfo" class="blue" style="margin-left:10px;">刷新</span></p>
<p class="gray fz12">同步全部商品可能会需要比较久的时间，请耐心等待</p>
</div>
</div>
<div class="text-center pt20">
<el-select class="w100" v-if="loadStatus === 1 && count!==0" v-model="size" placeholder="选择群发类型">
<el-option v-for="item in sizeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-button v-if="loadStatus === 1" type="primary" @click="syncWechat()">立即同步</el-button>
<el-button v-if="loadStatus === 0" type="primary" :loading="true">同步中</el-button>
<el-button v-if="loadStatus === 3" icon="el-icon-error" type="danger" >同步失败</el-button>
</div>
</el-dialog>
<el-dialog class="sync-imgtext__dialog" title="同步微信图文" :visible.sync="show" width="30%" :before-close="close" v-loading="loading">
<div class="gic-modal-bd text-center">
<div class="gic-modal-content">
<p class="fz16" style="margin-bottom:20px">微信图文共<span> {{count}} </span>条<span @click="getSyncInfo" class="blue" style="margin-left:10px;">刷新</span></p>
<p class="gray fz12">同步全部商品可能会需要比较久的时间，请耐心等待</p>
</div>
</div>
<div class="text-center pt20">
<el-select class="w100" v-if="loadStatus === 1 && count!==0" v-model="size" placeholder="选择群发类型">
<el-option v-for="item in sizeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-button v-if="loadStatus === 1" type="primary" @click="syncWechat()">立即同步</el-button>
<el-button v-if="loadStatus === 0" type="primary" :loading="true">同步中</el-button>
<el-button v-if="loadStatus === 3" icon="el-icon-error" type="danger" >同步失败</el-button>
</div>
</el-dialog>
</template>
<script>
import {getSyncInfo,syncWechatImageText} from '@/service/api/wechatApi.js';
......
src/components/libs/videoTemp/index.vue
<template>
<section class="dm-vlib">
<ul class="clearfix lib-video__list" v-loading="loading" :style="scrollStyle">
<li class="lib-video--add fl">
<div @click="$router.push('/wechat/temp/video/add')" >
<i class="el-icon-plus"></i><span>新建视频</span>
<el-row :gutter="20" class="clearfix lib-video__list" v-loading="loading" :style="scrollStyle">
<el-col :span="8">
<div class="lib-video--add">
<div @click="$router.push('/wechat/temp/video/add')" >
<i class="el-icon-plus"></i><span>新建视频</span>
</div>
</div>
</li>
</el-col>
<dm-video-item :chooseFlag="chooseFlag" class="fl" v-for="(v,i) in videoList" :key="i" :videoData="v" @edit="edit" @del="del"></dm-video-item>
</ul>
</el-row>
<div class="text-center" v-if="videoList.length === 0">
<img class="block block-center pt100" width="60" height="60" src="../../../assets/img/no-data_icon.png" alt="">
<el-button class="block block-center mt10" type="text" @click="$router.push('/wechat/temp/video/add')">新建视频</el-button>
</div>
<el-pagination v-show="videoList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<!-- <el-pagination v-show="videoList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination> -->
</section>
</template>
<script>
......@@ -40,7 +42,7 @@ export default {
videoList:[],
listParams:{
currentPage:1,
pageSize:20
pageSize:999
},
total:1,
loading:false
......@@ -97,10 +99,10 @@ export default {
}
.lib-video--add{
border: 1px dashed #e4e7ed;
width: 290px;
height: 276px;
// width: 290px;
margin-bottom: 20px;
height: 286px;
overflow: hidden;
margin: 10px;
background:#fff;
cursor: pointer;
text-align:center;
......@@ -110,7 +112,7 @@ export default {
color: #1890ff;
}
i{
line-height:276px;
line-height:286px;
font-size:16px;
vertical-align:middle;
}
......
src/components/libs/videoTemp/videoItem.vue
<template>
<li class="video-item" :class="{'active':currentId === mediaId}" @click="choose">
<div class="video-item_top clearfix">
<div>
<h5 class="ellipsis-100">{{videoData.titleName || '未命名视频'}}</h5>
<p class="gray fz12 ellipsis-100">{{videoData.createTimeStr}}</p>
<el-col :span="8">
<div class="video-item" :class="{'active':currentId === mediaId}" @click="choose">
<div class="video-item_top clearfix">
<div>
<h5 class="ellipsis-100">{{videoData.titleName || '未命名视频'}}</h5>
<p class="gray fz12 ellipsis-100">{{videoData.createTimeStr}}</p>
</div>
</div>
<div class="video-item_center clearfix">
<div class="video-item_center__img">
<i class="iconfont icon-shipin1"></i>
</div>
<p class="fl gray fz12 ellipsis-100">{{videoData.remark}}</p>
</div>
<div class="video-item_bottom" v-if="!chooseFlag">
<i class="el-icon-edit" @click="edit"></i>
<dm-confirm @confirm="del" tips="确认删除该视频?">
<i class="el-icon-delete"></i>
</dm-confirm>
</div>
</div>
<div class="video-item_center clearfix">
<img class="fl" src="../../../assets/img/video_img.jpg" alt="" srcset="">
<p class="fl gray fz12 ellipsis-100">{{videoData.remark}}</p>
</div>
<div class="video-item_bottom" v-if="!chooseFlag">
<i class="el-icon-edit" @click="edit"></i>
<dm-confirm @confirm="del" tips="确认删除该视频?">
<i class="el-icon-delete"></i>
</dm-confirm>
</div>
</li>
</el-col>
</template>
<script>
......@@ -59,49 +63,58 @@ export default {
.video-item{
background:#fff;
border: 1px solid #e4e7ed;
width: 290px;
margin: 10px;
// width: 290px;
margin-bottom: 20px;
overflow: hidden;
cursor: pointer;
vertical-align:middle;
&:hover{
border: 1px solid #1890ff;
box-shadow: 0 2px 8px rgba(0,0,0,.15);
}
&.active{
border: 2px solid $danger-color;
}
&_top {
padding: 5px 10px 0 10px;
padding: 20px 24px 0 24px;
line-height: 20px;
}
&_center{
padding:10px;
height: 180px;
&>img{
width: 270px;
padding:10px 24px;
height: 190px;
&__img{
width:100% ;
height: 160px;
}
&>div{
padding-left: 15px;
line-height: 20px;
background: #b9c7db;
text-align: center;
i {
line-height: 160px;
color: rgba(255, 255, 255, 0.8);
font-size: 48px;
}
}
&>p {
line-height: 30px;
line-height: 40px;
}
}
&_bottom {
display: flex;
justify-content: space-around;
align-items: center;
height: 30px;
background: $gray-color;
border-top: 1px solid $border-color;
height: 40px;
background: #f7f9fa;
border-top: 1px solid #e4e7ed;
cursor: pointer;
i{
font-size: 16px;
color:#909399;
&:hover{
color: #1890ff;
}
&.el-icon-delete{
&:hover{
color: $danger-color;
}
}
}
}
}
......
src/components/wxText/wxText.vue
......@@ -270,7 +270,7 @@
.attention-text-wrap{
.attention-text-content{
width: 100%;
border: 1px solid #e7e7eb;
border: 1px solid #dcdfe6;
border-radius:2px;
.text-title{
width: 100%;
......@@ -278,7 +278,7 @@
line-height: 44px;
position: relative;
z-index: 1;
border-bottom: 1px solid #e7e7eb;
border-bottom: 1px solid #dcdfe6;
padding-left: 10px;
box-sizing: border-box;
a{
......
src/router/modules/card.js
......@@ -5,10 +5,10 @@ import cardRecord from '../../views/card/record'
import cardRecordSend from '../../views/card/record-send'
import cardRecordGet from '../../views/card/record-get'
import cardGroupSend from '../../views/card/group-send'
import cardAnalysis from '../../views/card/card-analysis'
import cardAnalysis from '../../views/card/analysis'
import cardInfo from '../../views/card/card-info'
import cardShelf from '../../views/card/shelf'
import cardManager from '../../views/card/card-manager'
import cardManager from '../../views/card/manager'
import cardCheck from '../../views/card/check'
......
src/views/card/list.vue
......@@ -25,8 +25,8 @@
</template>
<script>
import {cardPageList,deleteCard} from '@/service/api/cardApi.js';
import adjustStock from './adjust-Stock';
import cardItem from './card-item';
import adjustStock from './partials/adjust-Stock';
import cardItem from './partials/card-item';
export default {
name: 'card-list',
data () {
......
src/views/card/card-manager.vue → src/views/card/manager.vue
......@@ -18,8 +18,8 @@
</template>
<script>
import {cardPageList,deleteShelfCard} from '@/service/api/cardApi.js';
import cardItem from './card-item';
import shelfAdd from './shelf-add';
import cardItem from './partials/card-item';
import shelfAdd from './partials/shelf-add';
export default {
name: 'card-manager',
......
src/views/card/card-item.vue → src/views/card/partials/card-item.vue
......@@ -35,7 +35,7 @@
</template>
<script>
import renderTemp from './render.js'
import renderTemp from './status-render.js'
import { formateDateTimeByType } from '@/utils/index.js'
export default {
props: {
......@@ -124,9 +124,10 @@ export default {
text-align: center;
color: #fff;
background: #63b359;
padding: 10px 0;
h4{
font-size: 18px;
font-weight: bold;
font-size: 16px;
font-weight: 500;
line-height: 1.8em;
}
p{
......
src/views/game/dzp/index.vue
......@@ -55,7 +55,11 @@ export default {
return row.gameWinningRate.toFixed(1) +'%'
}},
{label:'游戏状态',prop:'gameStatusName',width:'80',align:'left',isRender:true,formatter:function(row){
return `<div class="${row.gameStatusName === '进行中'?'dm-status--primary--flash':(row.gameStatusName === '未开始'?'dm-status--warning':'dm-status--info')}">${row.gameStatusName}</div>`
if (row.gameStatusName === '进行中') {
return `<div><span class="dm-status--primary--flash"></span>${row.gameStatusName}</div>`
} else {
return `<div class="${row.gameStatusName === '未开始'?'dm-status--warning':'dm-status--info'}">${row.gameStatusName}</div>`
}
}},
{label:'开始时间',prop:'gameStartTime',minWidth:'170', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.gameStartTime,'yyyy-MM-dd-HH-mm-ss');
......
src/views/game/ggk/index.vue
......@@ -55,7 +55,11 @@ export default {
return row.gameWinningRate.toFixed(1) +'%'
}},
{label:'游戏状态',prop:'gameStatusName',width:'80',align:'left',isRender:true,formatter:function(row){
return `<div class="${row.gameStatusName === '进行中'?'dm-status--primary--flash':(row.gameStatusName === '未开始'?'dm-status--warning':'dm-status--info')}">${row.gameStatusName}</div>`
if (row.gameStatusName === '进行中') {
return `<div><span class="dm-status--primary--flash"></span>${row.gameStatusName}</div>`
} else {
return `<div class="${row.gameStatusName === '未开始'?'dm-status--warning':'dm-status--info'}">${row.gameStatusName}</div>`
}
}},
{label:'开始时间',prop:'gameStartTime',minWidth:'170', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.gameStartTime,'yyyy-MM-dd-HH-mm-ss');
......
src/views/game/klfl/index.vue
......@@ -49,7 +49,13 @@ export default {
tableHeader:[
{label:'游戏名称',prop:'gameName',width:'120',align:'left',fixed:'left'},
{label:'游戏状态',prop:'activityStatus',width:'80',align:'left',formatter:function(row){
return `<div class="${row.activityStatus === 0 ?'dm-status--warning':(row.activityStatus === 1?'dm-status--primary--flash':'dm-status--info')}">${row.activityStatus === 0 ? '待开始':(row.activityStatus === 1 ? '进行中' : '已结束')}</div>`;
if (row.activityStatus === 1) {
return `<div><span class="dm-status--primary--flash"></span>进行中</div>`
} else {
return `<div class="${row.activityStatus === 0?'dm-status--warning':'dm-status--info'}">
${row.activityStatus === 0 ? '待开始':'已结束'}
</div>`
}
}},
{label:'开始时间',prop:'gameStartTime',minWidth:'170', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.gameStartTime,'yyyy-MM-dd-HH-mm-ss');
......
src/views/game/ptyx/index.vue
......@@ -46,7 +46,13 @@ export default {
tableHeader:[
{label:'游戏名称',prop:'gameName',width:'120',align:'left',fixed:'left'},
{label:'游戏状态',prop:'activityStatus',width:'80',align:'left',formatter:function(row){
return `<div class="${row.activityStatus === 0 ?'dm-status--warning':(row.activityStatus === 1?'dm-status--primary--flash':'dm-status--info')}">${row.activityStatus === 0 ? '待开始':(row.activityStatus === 1 ? '进行中' : '已结束')}</div>`
if (row.activityStatus === 1) {
return `<div><span class="dm-status--primary--flash"></span>进行中</div>`
} else {
return `<div class="${row.activityStatus === 0?'dm-status--warning':'dm-status--info'}">
${row.activityStatus === 0 ? '待开始':'已结束'}
</div>`
}
}},
{label:'开始时间',prop:'gameStartTime',minWidth:'170', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.gameStartTime,'yyyy-MM-dd-HH-mm-ss');
......
src/views/game/znm/index.vue
......@@ -42,7 +42,13 @@ export default {
tableHeader:[
{label:'游戏名称',prop:'gameName',width:'120',align:'left',fixed:'left',tooltip:true},
{label:'游戏状态',prop:'activityStatus',width:'80',align:'left',formatter:function(row){
return `<div class="${row.activityStatus === 0 ?'dm-status--warning':(row.activityStatus === 1?'dm-status--primary--flash':'dm-status--info')}">${row.activityStatus === 0 ? '待开始':(row.activityStatus === 1 ? '进行中' : '已结束')}</div>`
if (row.activityStatus === 1) {
return `<div><span class="dm-status--primary--flash"></span>进行中</div>`
} else {
return `<div class="${row.activityStatus === 0?'dm-status--warning':'dm-status--info'}">
${row.activityStatus === 0 ? '待开始':'已结束'}
</div>`
}
}},
{label:'开始时间',prop:'gameStartTime',minWidth:'170', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.gameStartTime,'yyyy-MM-dd-HH-mm-ss');
......
src/views/message/addTemp.vue
......@@ -3,7 +3,7 @@
<el-row :gutter="20" class="sms-temp_tipsT">
<el-col :span="24" class="">
<p style="color:#1890ff;">1.长度不要超过450字(汉字，字符，数字等可见符号，都按1个字计算)。单条短信长度为70字，超过70字后，按67字/条分割成多条，以长短信的方式发送给用户，即用户收到的是一条长短信，但是按多条计费</p>
<p>2.营销类短信，请在短信内容后面增加<span class="danger-color">“回T退订”</span></p>
<p>2.营销类短信，请在短信内容后面增加<span style="color:#1890ff;">“回T退订”</span></p>
<p>3.短信模板内容不能含有【】符号</p>
<p>4.不能发送房产、移民、贷款、政治、色情、暴力等违法类短信</p>
<p>5.短信内容中不能输入Enter/换行，否则将导致短信分条发送</p>
......
src/views/message/detail.vue
......@@ -29,7 +29,7 @@
</el-col>
<el-col :span="24">
<span class="primary-font-color">短信模板：</span>
<span class="regular-font-color" style="max-width: 100%;overflow: auto;">{{messageInfo.templateContent}}</span>
<span class="regular-font-color" style="max-width: 100%;overflow: auto;line-height:2;">{{messageInfo.templateContent}}</span>
</el-col>
</el-row>
</el-form>
......@@ -41,10 +41,10 @@
<el-button icon="iconfont icon-icon_yunxiazai fz14" type="primary" class="fr" @click="exportExcel"> 下载Excel</el-button>
</div>
<el-table tooltipEffect="light" :data="messageList" style="width: 100%" v-loading="messageLoading">
<el-table-column :width="150" align="left" label="会员信息">
<el-table-column min-width="150" align="left" label="会员信息">
<template slot-scope="scope">
<div class="sms-table_info">
<img class="vertical-middle" :src="scope.row.thirdImgUrl" alt="" srcset="">
<img class="table__avatar vertical-middle" :src="scope.row.thirdImgUrl" alt="" srcset="">
<div class="inline-block vertical-middle">
<p class="fz14">{{scope.row.memberName}}</p>
<p class="fz12 gray">{{scope.row.nickname}}</p>
......@@ -60,7 +60,15 @@
<el-button v-else type="text" @click="errorCodeShow = true">{{scope.row.errorMsg}}</el-button>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" :min-width="150" align="left" label="短信内容" prop="remark"></el-table-column>
<el-table-column :show-overflow-tooltip="false" :min-width="150" align="left" label="短信内容" prop="remark">
<template slot-scope="scope">
<el-popover class="item" trigger="hover" width="300" v-if="scope.row.remark.length>10" :content="scope.row.remark" placement="top-start">
<span slot="reference" class="ellipsis">{{scope.row.remark}}</span>
</el-popover>
<span v-else>{{scope.row.remark}}</span>
</template>
</el-table-column>
</el-table>
<el-pagination v-show="messageList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
</div>
......@@ -83,7 +91,7 @@ import errorCodeDialog from './errorCode'
{label:'回执状态',prop:'sendStatus',width:'80',align:'left',formatter:function(row){
return row.sendStatus === 0 ? '成功':(row.sendStatus === 1 ? '未发送' : '失败')
}},
{label:'上报时间',prop:'backTime',width:'100', tooltip:true,align:'left',formatter:function(row){
{label:'上报时间',prop:'backTime',minWidth:'100', tooltip:true,align:'left',formatter:function(row){
return formateDateTimeByType(row.backTime,'yyyy-MM-dd-HH-mm-ss');
}},
{label:'发送状态',prop:'backStatus',width:'80',align:'left',formatter:function(row){
......
src/views/message/record.vue
......@@ -15,7 +15,8 @@
<el-table-column v-for="(v,i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed"></el-table-column>
<el-table-column label="状态" prop="sendStatus" align="left" width="140px">
<template slot-scope="scope" >
<span :class="'dm-status--' + filterStatus(scope.row.sendStatus).type">{{filterStatus(scope.row.sendStatus).label}}</span>
<span v-if="scope.row.sendStatus === 5"><span class="dm-status--primary--flash"></span>执行中</span>
<span v-else :class="'dm-status--' + filterStatus(scope.row.sendStatus).type">{{filterStatus(scope.row.sendStatus).label}}</span>
<div v-if="scope.row.sendStatus == 0">
<time-counts class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
</div>
......
src/views/wechat/editor.vue
......@@ -36,8 +36,8 @@
<p class="line-height2 pt10">作者</p>
<dm-input size="medium" v-model="activeImgText.authorName" :maxlength="8"></dm-input>
<p class="line-height2 pt10" >封面 <span class="gray fz12">(大图片建议尺寸：900像素 * 500像素)</span></p>
<upload-img url="/api-marketing/marketing-wechat-image-save" class="inline-block" size="medium" :model.sync="postImg" :showImg="false" width="auto" label="本地上传" tips="" :labelStyle="{padding: '10px 20px',fontSize:'14px',borderRadius:'4px'}"></upload-img>
<el-button class="ml5" size="medium" @click="postFlag = true; imgShow = true;">从素材中选择</el-button>
<upload-img url="/api-marketing/marketing-wechat-image-save" class="inline-block" :model.sync="postImg" :showImg="false" width="auto" label="本地上传" tips="" :labelStyle="{padding: '8px 15px',fontSize:'14px',borderRadius:'4px'}"></upload-img>
<el-button class="ml5" @click="postFlag = true; imgShow = true;">从素材中选择</el-button>
<div class="cover_preview" v-show="activeImgText.qcloudImageUrl" :style="'background-image: url('+(activeImgText.qcloudImageUrl)+')'"></div>
<el-checkbox class="pt10" v-show="activeImgText.qcloudImageUrl" v-model="activeImgText.imageType" :true-label="1" :false-label="0">封面图片显示在正文中</el-checkbox>
......@@ -89,7 +89,7 @@
<preview :show.sync="previewShow" :imgTextList="imgTextList" :firstImgText="firstImgText"></preview>
<div class="btn-wrap_fixed" :class="{'on':asideShow}">
<el-button type="primary" @click="submit">保 存</el-button>
<el-button type="warning" @click="previewShow = true">预 览</el-button>
<el-button @click="previewShow = true">预 览</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
</section>
......
src/views/wechat/preview.vue
......@@ -12,7 +12,7 @@
<p style="margin-bottom: 12px;color: #8c8c8c;font-size: 13px;">{{formateDateTimeByType(firstImgText.updateTime,'yyyy-MM-dd')}}</p>
</div>
<div class="card_appmsg_item">
<img style="width: 243px;height: 120px;" id="main-item-img" :src="firstImgText.qcloudImageUrl">
<img style="width: 243px;height: 120px;" id="main-item-img" :src="firstImgText.qcloudImageUrl || ''">
</div>
<div class="card_appmsg_item" v-if="imgTextList.length<1">
<div class="card_appmsg_content" style="padding-bottom: 8px;font-size: 10px;" id="main-item-remark">{{firstImgText.remark}}</div>
......
src/views/wechat/record.vue
......@@ -2,7 +2,7 @@
* @Author: zhangmeng
* @Date: 2018-08-14 15:45:36
* @Last Modified by: zhangmeng
* @Last Modified time: 2018-09-27 14:49:06
* @Last Modified time: 2018-09-28 11:38:09
*/
<template>
<section class="dm-wrap">
......@@ -22,29 +22,29 @@
<el-button class="fr" type="primary" @click="$router.push('/wechat/record/add')">新建群发</el-button>
</div>
<el-table tooltipEffect="light" :data="recordList" style="width: 100%" v-loading="loading">
<el-table-column v-for="(v,i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed"></el-table-column>
<el-table-column label="状态" align="left" prop="timesStatus" width="140px">
<template slot-scope="scope" >
<span v-if="scope.row.sendStatus == 1" class="dm-status--success">已发送</span>
<span v-if="scope.row.sendStatus == 2" class="dm-status--info">已失效</span>
<div v-if="scope.row.sendStatus == 0">
<span class="dm-status--primary--flash">待发送</span>
<time-counts class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" v-if="scope.row.contentType === 0 && scope.row.sendStatus === 1 && scope.row.couponType === 1" @click="queryData(scope.row)">数据</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该发送记录?">
<el-button type="text">删除</el-button>
</dm-confirm>
<dm-confirm @confirm="invalidData(scope.row)" v-if="scope.row.contentType===0 && scope.row.sendType !==2 && scope.row.sendStatus==1" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
</dm-confirm>
<el-button type="text" v-if="scope.row.sendStatus===0" @click="$router.push('/wechat/record/edit/'+scope.row.wechatTeletextId)">编辑</el-button>
</template>
</el-table-column>
<el-table-column v-for="(v,i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed"></el-table-column>
<el-table-column label="状态" align="left" prop="timesStatus" width="140px">
<template slot-scope="scope" >
<span v-if="scope.row.sendStatus == 1" class="dm-status--success">已发送</span>
<span v-if="scope.row.sendStatus == 2" class="dm-status--info">已失效</span>
<div v-if="scope.row.sendStatus == 0">
<span class="dm-status--primary">待发送</span>
<time-counts class="primary-color fz12" :defaultVal="scope.row.sendTime" :autoStart="true"></time-counts>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="140px" fixed="right">
<template slot-scope="scope" >
<el-button type="text" v-if="scope.row.contentType === 0 && scope.row.sendStatus === 1 && scope.row.couponType === 1" @click="queryData(scope.row)">数据</el-button>
<dm-confirm @confirm="delData(scope.row)" tips="是否删除该发送记录?">
<el-button type="text">删除</el-button>
</dm-confirm>
<dm-confirm @confirm="invalidData(scope.row)" v-if="scope.row.contentType===0 && scope.row.sendType !==2 && scope.row.sendStatus==1" tips="是否禁用该发送记录?">
<el-button type="text">禁用</el-button>
</dm-confirm>
<el-button type="text" v-if="scope.row.sendStatus===0" @click="$router.push('/wechat/record/edit/'+scope.row.wechatTeletextId)">编辑</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination v-show="recordList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></el-pagination>
<dm-dialog :show.sync="dmDialogShow" :dataId="dmDialogId"></dm-dialog>
......
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