Commit 866f3f99 by damodmg

Merge branch 'dev' into 'master'

Dev

See merge request !44
parents 63e89c17 25e0dad7
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.c59732585a037ce3398a2b868ac2b6f4.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.2a66e15144de1c0f565b.js></script><script type=text/javascript src=./static/js/app.b68de82f60ec8fe0bf79.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.ad982c664928a8a1b84619d3d4948ae7.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.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-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.4da9883abe21a1dee1df.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -40,10 +40,6 @@ ...@@ -40,10 +40,6 @@
content: "\e635"; content: "\e635";
} }
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before { .icon-lipin:before {
content: "\e78a"; content: "\e78a";
} }
...@@ -56,6 +52,10 @@ ...@@ -56,6 +52,10 @@
content: "\e615"; content: "\e615";
} }
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before { .icon-xinxixianshi:before {
content: "\e74f"; content: "\e74f";
} }
......
...@@ -38,9 +38,6 @@ Created by iconfont ...@@ -38,9 +38,6 @@ Created by iconfont
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" /> <glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" /> <glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
...@@ -50,6 +47,9 @@ Created by iconfont ...@@ -50,6 +47,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" /> <glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="shezhi" unicode="&#58979;" d="M245.921684 33.684211a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894737h138.13221z m377.263158 377.263157a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894736h-84.237473a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894736h515.395368z m-377.263158 377.263158a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 0 0 0 53.894737h138.13221zM350.315789 707.368421a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m-377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" /> <glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.02.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-linkage.2.0.01.js'></script> <script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js'></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.0.01.js"></script> --> <!-- <script src="//web-1251519181.file.myqcloud.com/components/member-info.1.0.01.js"></script> -->
<script src="//web-1251519181.file.myqcloud.com/components/card.2.0.03.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.03.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js"></script>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<el-input-number v-model="editInfoModal.num" style="width:330px" :precision="2" :min="0"> </el-input-number> <el-input-number v-model="editInfoModal.num" style="width:330px" :precision="2" :min="0"> </el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="库存" label-width="80px" prop="num" v-if="editInfoModal.type === '库存'"> <el-form-item label="库存" label-width="80px" prop="num" v-if="editInfoModal.type === '库存'">
<el-input-number v-model="editInfoModal.num" style="width:330px" :precision="0" :min="0"> </el-input-number> <el-input-number v-model="editInfoModal.num" style="width:330px" :precision="0" :min="1"> </el-input-number>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
...@@ -136,7 +136,7 @@ export default { ...@@ -136,7 +136,7 @@ export default {
this.$message.error('请输入大于0的数字'); this.$message.error('请输入大于0的数字');
this.virtualStock = ''; this.virtualStock = '';
} else if (!Number(this.virtualStock)) { } else if (!Number(this.virtualStock)) {
this.$message.error('请输入数字类型1'); this.$message.error('请输入数字类型');
this.virtualStock = ''; this.virtualStock = '';
} else if (Number(this.virtualStock) > 1000000) { } else if (Number(this.virtualStock) > 1000000) {
this.$message.error('库存最大1000000'); this.$message.error('库存最大1000000');
...@@ -152,6 +152,8 @@ export default { ...@@ -152,6 +152,8 @@ export default {
if (Number(item2.valueName < 0)) { if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字'); this.$message.error('请输入大于0的数字');
item2.valueName = ''; item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) { } else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型'); this.$message.error('请输入数字类型');
item2.valueName = ''; item2.valueName = '';
...@@ -253,13 +255,7 @@ export default { ...@@ -253,13 +255,7 @@ export default {
} }
} }
} }
if (this.intergralModal.type === 'stock') {
//库存
if (!this.virtualStock || Number(this.virtualStock) === 0) {
this.$message.errror('请输入库存');
return false;
}
}
if (skuJson) { if (skuJson) {
for (let item of skuJson) { for (let item of skuJson) {
if (this.intergralModal.type === 'cash') { if (this.intergralModal.type === 'cash') {
...@@ -295,6 +291,17 @@ export default { ...@@ -295,6 +291,17 @@ export default {
params.virtualStock = num; params.virtualStock = num;
} }
} }
if (this.intergralModal.type === 'stock') {
//库存
if (!params.virtualStock) {
this.$message.error('请输入库存');
return false;
}
if (Number(params.virtualStock) === 0) {
this.$message.error('库存为0不允许修改');
return false;
}
}
request.post('/api-integral-mall/update-gift-sku', qs.stringify(params)).then(res => { request.post('/api-integral-mall/update-gift-sku', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
......
...@@ -106,6 +106,10 @@ export default { ...@@ -106,6 +106,10 @@ export default {
methods: { methods: {
// 上传图片 // 上传图片
handleImgUpload(blobInfo, success, failure) { handleImgUpload(blobInfo, success, failure) {
if (blobInfo.blob().size > 5 * 1024 * 1024) {
failure('请上传小于 5 M 文件');
return false;
}
var that = this; var that = this;
let formdata = new FormData(); let formdata = new FormData();
formdata.set('upload_file', blobInfo.blob()); formdata.set('upload_file', blobInfo.blob());
......
...@@ -9,7 +9,9 @@ import couponInfo from '../views/goods/coupon/info'; ...@@ -9,7 +9,9 @@ import couponInfo from '../views/goods/coupon/info';
import giftExchange from '../views/order/giftExchange'; import giftExchange from '../views/order/giftExchange';
import couponExchange from '../views/order/couponExchange'; import couponExchange from '../views/order/couponExchange';
import refundList from '../views/order/refundList'; import refundList from '../views/order/refundList';
import deliverSet from '../views/setting/deliverSet';
import editDeliver from '../views/setting/editDeliver';
import orderDetail from '../views/order/orderDetail';
Vue.use(VueClipboard); Vue.use(VueClipboard);
const router = new Router({ const router = new Router({
...@@ -45,6 +47,11 @@ const router = new Router({ ...@@ -45,6 +47,11 @@ const router = new Router({
component: giftExchange component: giftExchange
}, },
{ {
path: '/orderDetail',
name: 'orderDetail',
component: orderDetail
},
{
path: '/couponExchange', path: '/couponExchange',
name: 'couponExchange', name: 'couponExchange',
component: couponExchange component: couponExchange
...@@ -53,6 +60,16 @@ const router = new Router({ ...@@ -53,6 +60,16 @@ const router = new Router({
path: '/refundList', path: '/refundList',
name: 'refundList', name: 'refundList',
component: refundList component: refundList
},
{
path: '/deliverSet',
name: 'deliverSet',
component: deliverSet
},
{
path: '/editDeliver',
name: 'editDeliver',
component: editDeliver
} }
] ]
} }
......
...@@ -9,12 +9,14 @@ import router from '../router'; ...@@ -9,12 +9,14 @@ import router from '../router';
// let adminUrl = process.env.NODE_ENV === 'production' ? '':'http://111.231.99.90:8880/app/mock/19' // let adminUrl = process.env.NODE_ENV === 'production' ? '':'http://111.231.99.90:8880/app/mock/19'
let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com'; let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com';
let request; let request;
request = axios.create({ request = axios.create({
baseURL: adminUrl, baseURL: adminUrl,
withCredentials: true, //跨域凭证 withCredentials: true, //跨域凭证
timeout: 30000, timeout: 30000,
headers: { headers: {
// 'Content-Type': 'application/x-www-form-urlencoded' // 'Content-Type': 'application/x-www-form-urlencoded'
sign:''
}, },
}); });
...@@ -29,6 +31,12 @@ request.interceptors.request.use( ...@@ -29,6 +31,12 @@ request.interceptors.request.use(
if (store.state.token) { if (store.state.token) {
config.headers.Authorization = `token ${store.state.token}`; config.headers.Authorization = `token ${store.state.token}`;
} }
if(localStorage.getItem('sign')) {
config.headers.sign = localStorage.getItem('sign')
}else{
config.headers.sign = ''
}
// config.headers.sign = localStorage.getItem('sign')
return config; return config;
}, },
err => { err => {
...@@ -42,7 +50,9 @@ request.interceptors.response.use( ...@@ -42,7 +50,9 @@ request.interceptors.response.use(
if (response.status == 200 && response.data.errorCode === 401) { if (response.status == 200 && response.data.errorCode === 401) {
window.location.href = window.location.origin + '/gic-web'; window.location.href = window.location.origin + '/gic-web';
// window.location.href = 'http://gicdev.com/gic-web' // window.location.href = 'http://gicdev.com/gic-web'
} }
return response; return response;
}, },
error => { error => {
......
...@@ -41,9 +41,18 @@ ...@@ -41,9 +41,18 @@
<el-table-column label="礼品信息" min-width="310px"> <el-table-column label="礼品信息" min-width="310px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<img v-if="scope.row.cardType === 2" src="../../../../static/img/quan02.png" alt="" /> <!-- <p v-if="scope.row.cardType === 2" style="display:inline-block">
<img v-if="scope.row.cardType === 0" src="../../../../static/img/quan01.png" alt="" /> <img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../../static/img/quan03.png" alt="" /> <img v-else src="../../../../static/img/quan02.png" alt="" />
</p>
<p style="display:inline-block" v-if="scope.row.cardType === 0">
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt="" />
<img v-else src="../../../../static/img/quan01.png" alt="" />
</p> -->
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" alt="" />
<img v-if="scope.row.cardType === 2 && !scope.row.mainImageUrl" src="../../../../static/img/quan02.png" alt="" />
<img v-if="scope.row.cardType === 0 && !scope.row.mainImageUrl" src="../../../../static/img/quan01.png" alt="" />
<img v-if="scope.row.cardType === 1 && !scope.row.mainImageUrl" src="../../../../static/img/quan03.png" alt="" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p> <p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p> <p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
...@@ -87,7 +96,7 @@ ...@@ -87,7 +96,7 @@
<el-button type="text" v-if="scope.row.status === 1" @click="deleteList(scope.row, 2)">上架</el-button> <el-button type="text" v-if="scope.row.status === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button> <el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px"> <el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该页面吗?</p> <p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该商品吗?</p>
<div style="text-align: right; margin: 0"> <div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button> <el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button> <el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button>
...@@ -161,10 +170,22 @@ export default { ...@@ -161,10 +170,22 @@ export default {
mallProId: '', mallProId: '',
type: '', type: '',
costValue: '' costValue: ''
} },
couponListObj: {}
}; };
}, },
created() { created() {
if (localStorage.getItem('couponListObj')) {
this.couponListObj = JSON.parse(localStorage.getItem('couponListObj'));
this.currentPage = this.couponListObj.currentPage;
this.pageSize = this.couponListObj.pageSize;
this.total = this.couponListObj.total;
this.shelf = this.couponListObj.shelf;
this.searchValue = this.couponListObj.searchValue;
this.sortType = this.couponListObj.sortType;
this.sortColumn = this.couponListObj.sortColumn;
localStorage.removeItem('couponListObj'); //使用完就清除缓存
}
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -340,6 +361,16 @@ export default { ...@@ -340,6 +361,16 @@ export default {
}, },
// 编辑 // 编辑
goAdd(item) { goAdd(item) {
this.couponListObj = {
currentPage: this.currentPage,
pageSize: this.pageSize,
total: this.total,
shelf: this.shelf,
searchValue: this.searchValue,
sortType: this.sortType,
sortColumn: this.sortColumn
};
window.localStorage.setItem('couponListObj', JSON.stringify(this.couponListObj));
this.$router.push({ name: 'couponInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId } }); this.$router.push({ name: 'couponInfo', query: { giftId: item.integralMallProId, coupCardId: item.proReferId } });
}, },
handleTable(item, type) { handleTable(item, type) {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="add-sku-btn" v-show="skuJson.length < 3"> <div class="add-sku-btn" v-show="skuJson.length < 3 && giftType === 1">
<el-button type="primary" size="small" @click="addSku">添加规格</el-button> <el-button type="primary" size="small" @click="addSku">添加规格</el-button>
<span class="tip-warm ml20">如有颜色、尺码等多种规格,请添加规格</span> <span class="tip-warm ml20">如有颜色、尺码等多种规格,请添加规格</span>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">公众号积分商城不支持此功能,小程序积分商城请升级至V3.0.0及以上版本</span> <span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">公众号积分商城不支持此功能,小程序积分商城请升级至V3.0.0及以上版本</span>
...@@ -116,6 +116,9 @@ export default { ...@@ -116,6 +116,9 @@ export default {
}, },
isStdImg: { isStdImg: {
type: Boolean type: Boolean
},
giftType: {
type: Number
} }
}, },
data() { data() {
...@@ -569,6 +572,8 @@ export default { ...@@ -569,6 +572,8 @@ export default {
if (Number(item2.valueName < 0)) { if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字'); this.$message.error('请输入大于0的数字');
item2.valueName = ''; item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) { } else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型'); this.$message.error('请输入数字类型');
item2.valueName = ''; item2.valueName = '';
......
<template>
<div>
<el-dialog title="券码" :visible.sync="couponListModal.dialogVisible" width="660px" @close="closeList">
<div>
<div class="coupon-search">
<el-input v-model="searchValue" placeholder="请输入卡号/卡密券码" prefix-icon="el-icon-search" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
<el-table :data="couponListModal.tableDate" style="width: 100%;" height="500">
<el-table-column prop="cardNumber" label="卡号" width="200px;">
<template slot-scope="scope">
<p style="line-height:16px">{{ scope.row.cardNumber ? scope.row.cardNumber : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="cardPassWord" label="卡密/券码" width="160px;">
<template slot-scope="scope">
<p style="line-height:16px">{{ scope.row.cardPassWord ? scope.row.cardPassWord : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="status" label="兑换状态" width="120px;">
<template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.status === 1 ? '未兑换' : '已兑换' }}</p>
</template>
</el-table-column>
<el-table-column label="操作" width="140px;">
<template slot-scope="scope">
<div>
<el-popover placement="top" width="160" v-model="scope.row.visible2">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该券码吗?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, scope.$index)">确定</el-button>
</div>
<el-button slot="reference" type="text" v-if="scope.row.status === 1">删除</el-button>
</el-popover>
</div>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div style="margin:15px 0;text-align:right" v-if="couponListModal.tableDate.length > 0">
<el-pagination :page-size="10" :pager-count="5" @current-change="handleCurrentChange" layout="prev, pager, next" :current-page="couponCurrentPage" :total="couponListModal.total"> </el-pagination>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import qs from 'qs';
import request from '../../../service/request.js';
export default {
props: {
couponListModal: {
type: Object
}
},
data() {
return {
dialogVisible: true,
searchValue: '',
couponCurrentPage: 1
};
},
methods: {
//搜索
getSearchList() {
this.couponCurrentPage = 1;
this.$emit('getChildSearch', this.searchValue, this.couponListModal.integralMallProId, this.couponCurrentPage);
},
//设置页码
handleCurrentChange(val) {
this.couponCurrentPage = val;
this.$emit('getChildSearch', this.searchValue, this.couponListModal.integralMallProId, this.couponCurrentPage);
},
//删除
deleteList(item, index) {
let params = {
giftCardId: item.giftCardId
};
request.post('/api-integral-mall/delete-giftcard', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.couponListModal.tableDate.splice(index, 1);
if (this.couponListModal.tableDate.length === 0) {
if (this.couponCurrentPage > 1) {
this.couponCurrentPage = this.couponCurrentPage - 1;
}
}
this.$message.success('删除成功');
this.$emit('getChildSearch', this.searchValue, this.couponListModal.integralMallProId, this.couponCurrentPage);
this.$emit('getList');
} else {
this.$message.error(res.data.message);
}
});
},
closeList() {
this.couponCurrentPage = 1;
this.searchValue = '';
this.$emit('getClose', this.couponCurrentPage, this.searchValue);
// this.$emit('getChildSearch', this.searchValue, this.couponListModal.integralMallProId, this.couponCurrentPage);
}
},
components: {}
};
</script>
<style scoped>
.coupon-search {
width: 260px;
margin-bottom: 22px;
}
</style>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="sortCost" label="库存" sortable="custom"> <el-table-column prop="sortCost" label="库存" sortable="custom">
<template slot-scope="scope"> <template slot-scope="scope">
<p class="intergral-edit">{{ scope.row.virtualStock }}<i class="el-icon-edit" @click="handleTable(scope.row, 'stock')"></i></p> <p class="intergral-edit">{{ scope.row.virtualStock }}<i class="el-icon-edit" v-if="scope.row.giftType === 1" @click="handleTable(scope.row, 'stock')"></i></p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sortTimes" label="销量" sortable="custom"> <el-table-column prop="sortTimes" label="销量" sortable="custom">
...@@ -95,15 +95,16 @@ ...@@ -95,15 +95,16 @@
<span style="display:none">{{ refash }}</span> <span style="display:none">{{ refash }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="180px"> <el-table-column label="操作" min-width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button type="text" @click="getLink(scope.row)">推广</el-button> <el-button type="text" @click="getLink(scope.row)">推广</el-button>
<el-button type="text" v-if="scope.row.changeType === '5'" @click="getCouponList(scope.row.integralMallProId)">券码</el-button>
<el-button type="text" v-if="scope.row.status === 2" @click="deleteList(scope.row, 1)">下架</el-button> <el-button type="text" v-if="scope.row.status === 2" @click="deleteList(scope.row, 1)">下架</el-button>
<el-button type="text" v-if="scope.row.status === 1" @click="deleteList(scope.row, 2)">上架</el-button> <el-button type="text" v-if="scope.row.status === 1" @click="deleteList(scope.row, 2)">上架</el-button>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button> <el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px"> <el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该页面吗?</p> <p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该商品吗?</p>
<div style="text-align: right; margin: 0"> <div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button> <el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button> <el-button type="primary" size="mini" @click="deleteList(scope.row, 0)">确定</el-button>
...@@ -137,6 +138,8 @@ ...@@ -137,6 +138,8 @@
<selectType :addModalData="addModalData"></selectType> <selectType :addModalData="addModalData"></selectType>
<!-- 调整积分费用 --> <!-- 调整积分费用 -->
<stockModal :intergralModal="intergralModal" @getList="getList" v-if="intergralModal.dialogVisible"></stockModal> <stockModal :intergralModal="intergralModal" @getList="getList" v-if="intergralModal.dialogVisible"></stockModal>
<!-- 卡券列表 -->
<couponList :couponListModal="couponListModal" v-if="couponListModal.dialogVisible" @getChildSearch="getChildSearch" @getList="getList" @getClose="getClose"></couponList>
</div> </div>
</template> </template>
...@@ -149,6 +152,7 @@ import eqCode from '../../../components/eqCode'; ...@@ -149,6 +152,7 @@ import eqCode from '../../../components/eqCode';
import selectType from '../../../components/selectGoodsType'; import selectType from '../../../components/selectGoodsType';
import stockModal from '../../../components/getSkuList'; import stockModal from '../../../components/getSkuList';
import copy from '../../../utils/clone.js'; import copy from '../../../utils/clone.js';
import couponList from './couponList';
export default { export default {
data() { data() {
return { return {
...@@ -198,10 +202,31 @@ export default { ...@@ -198,10 +202,31 @@ export default {
list: [], list: [],
type: '' type: ''
}, },
list: [] list: [],
giftListObj: {}, //缓存数据
couponListModal: {
dialogVisible: false,
integralMallProId: '',
tableDate: []
},
couponListSearch: '',
couponCurrentPage: 1,
couponPageSize: 20
}; };
}, },
created() { created() {
if (localStorage.getItem('giftListObj')) {
this.giftListObj = JSON.parse(localStorage.getItem('giftListObj'));
this.currentPage = this.giftListObj.currentPage;
this.pageSize = this.giftListObj.pageSize;
this.total = this.giftListObj.total;
this.shelf = this.giftListObj.shelf;
this.searchValue = this.giftListObj.searchValue;
this.giftType = this.giftListObj.giftType;
this.sortType = this.giftListObj.sortType;
this.sortColumn = this.giftListObj.sortColumn;
localStorage.removeItem('giftListObj'); //使用完就清除缓存
}
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -300,6 +325,47 @@ export default { ...@@ -300,6 +325,47 @@ export default {
} }
}); });
}, },
// 获取卡券列表
// showCouponListModal(item) {
// // console.log(item);
// this.getCouponList(item)
// this.couponListModal.dialogVisible = true;
// },
getChildSearch(val, id, couponCurrentPage) {
this.couponListSearch = val;
this.couponCurrentPage = couponCurrentPage;
this.getCouponList(id);
},
getClose(val, search) {
this.couponCurrentPage = val;
this.couponListSearch = search;
},
// 获取文本卡券列表
getCouponList(integralMallProId) {
let params = {
integralMallProId: integralMallProId,
search: this.couponListSearch,
currentPage: this.couponCurrentPage,
pageSize: 10
};
request.post('/api-integral-mall/page-giftcard', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.rows) {
this.couponListModal.tableDate = res.data.result.rows;
this.couponListModal.total = res.data.result.total;
} else {
this.couponListModal.tableDate = [];
this.couponListModal.total = 0;
}
this.couponListModal.dialogVisible = true;
this.couponListModal.integralMallProId = integralMallProId;
} else {
this.$message.error(res.data.message);
}
});
},
// 删除操作 // 删除操作
deleteList(item, type) { deleteList(item, type) {
let params = { let params = {
...@@ -393,6 +459,17 @@ export default { ...@@ -393,6 +459,17 @@ export default {
}, },
// 编辑 // 编辑
goAdd(item) { goAdd(item) {
this.giftListObj = {
currentPage: this.currentPage,
pageSize: this.pageSize,
total: this.total,
shelf: this.shelf,
giftType: this.giftType,
searchValue: this.searchValue,
sortType: this.sortType,
sortColumn: this.sortColumn
};
window.localStorage.setItem('giftListObj', JSON.stringify(this.giftListObj));
this.$router.push({ name: 'giftInfo', query: { type: item.giftType, giftId: item.integralMallProId, proReferId: item.proReferId } }); this.$router.push({ name: 'giftInfo', query: { type: item.giftType, giftId: item.integralMallProId, proReferId: item.proReferId } });
}, },
//编辑序号 //编辑序号
...@@ -545,7 +622,8 @@ export default { ...@@ -545,7 +622,8 @@ export default {
editName, editName,
eqCode, eqCode,
selectType, selectType,
stockModal stockModal,
couponList
} }
}; };
</script> </script>
...@@ -571,7 +649,7 @@ export default { ...@@ -571,7 +649,7 @@ export default {
.info-name { .info-name {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
width: 70%; width: 71%;
} }
.pro-ellipsis { .pro-ellipsis {
color: #303133; color: #303133;
......
<template>
<div>
<el-dialog title="批量导入文本券码" :visible.sync="importCouponModal.dialogVisible" width="620px">
<el-form :model="dialogForm" label-position="right" label-width="80px" v-loading="loading">
<el-form-item label="选择文件" required>
<div>
<div class="upload-btn">
<el-upload class="upload-ele" :action="action" :headers="headersUpload" :before-upload="uploadFileBefore" :on-success="uploadFile" with-credentials :show-file-list="showList" :data="uploadData">
<el-button size="small"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
</el-upload>
</div>
<el-button type="info" plain @click="downloadFile">下载EXCEL模板</el-button>
</div>
<p class="import-info" v-show="importMess">
本次共导入&nbsp;<span style="font-weight:600">{{ errornumber + correctNumber }}</span
>&nbsp;个商品,其中成功&nbsp;<span style="font-weight:600">{{ correctNumber }}</span
>&nbsp;个,失败&nbsp;<span style="color:#f5222d">{{ errornumber }}</span
>&nbsp;<a href="javaScript:void(0)" v-show="errornumber > 0" style="margin-left:10px" @click="showInfo">查看失败原因</a>
</p>
</el-form-item>
<el-form-item label="导入规则">
<div class="line"></div>
<div class="upload-rules">
<p>1. 每个sheet表最多1000条信息,文件大小不超过2M</p>
<p>2. 卡号可不填写,卡密/券码必填</p>
<p>3. 仅支持.xlsx 文件的导入(建议直接下载模板,在模板的基础上进行数据的填充)</p>
</div>
</el-form-item>
</el-form>
</el-dialog>
<errorList :importInfo="importInfo"></errorList>
</div>
</template>
<script>
import errorList from '../../order/errorList';
export default {
props: {
importCouponModal: {
type: Object
}
},
data() {
return {
action: window.location.origin + '/api-integral-mall/upload-gift-card?requestProject=intergral-mall',
// action: 'http://gicdev.demogic.com/api-integral-mall/upload-gift-card?requestProject=intergral-mall',
headersUpload: {
sign: ''
},
uploadData: {
integralMallProId: ''
},
dialogForm: {},
errorList: [],
showList: false,
correctNumber: 0,
errornumber: 0,
importInfo: {
//失败原因列表
dialogVisible: false,
list: []
},
importMess: false
};
},
methods: {
//下载模板
downloadFile() {
let url = 'static/文本券码导入模板.xlsx';
window.open(url);
},
//上传之前
uploadFileBefore(file) {
const isXlsx = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
if (file.type !== isXlsx) {
this.$message.error('文件格式错误,请导入.xlsx格式的文件');
return false;
}
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的文件');
return false;
}
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
this.headersUpload.sign = '';
}
this.uploadData.integralMallProId = this.importCouponModal.integralMallProId;
this.loading = true;
this.fileName = file.name;
},
//上传文件
uploadFile(file, fileList) {
if (file.errorCode === 0) {
this.importMess = true;
if (file.result !== '') {
this.importInfo.list = file.result.list;
this.correctNumber = file.result.correctNumber;
this.errornumber = file.result.errornumber;
this.dialogFormVisible = true;
this.loading = false;
if (file.result.total) {
//文本卡券导入的总数
this.$emit('getSuceessNum', file.result.total);
} else {
this.$emit('getSuceessNum', 0);
}
} else {
this.errorList = [];
}
} else {
this.loading = false;
this.$message.error(file.message);
this.fileName = '';
}
},
showInfo() {
this.importInfo.dialogVisible = true;
}
},
components: {
errorList
}
};
</script>
<style scoped>
.dialog-body {
display: flex;
justify-content: center;
margin-bottom: 25px;
/* justify-content: space-around; */
}
/*上传文件*/
.upload-btn {
height: 30px;
/* text-align: center; */
border: 1px dashed rgba(192, 196, 204, 1);
display: inline-block;
font-size: 14px;
color: #c0c4cc;
cursor: pointer;
margin-right: 10px;
width: 120px;
/* text-align: center; */
border-radius: 4px;
}
.import-info {
color: #606266;
margin-top: 10px;
}
.upload-ele .el-button {
border: none;
color: #c0c4cc;
}
.upload-ele .el-button--small {
padding: 7px 15px;
}
.upload-btn .el-icon-upload2 {
font-size: 16px;
color: #c0c4cc;
}
.upload-btn:hover {
border-color: #1890ff;
}
.line {
border-top: 1px solid #e4e7ed;
position: absolute;
left: 0px;
top: 15px;
width: 100%;
}
.upload-rules {
color: #909399;
font-size: 13px;
line-height: 18px;
margin-top: 30px;
}
.upload-ele .el-upload {
width: 120px !important;
display: inline !important;
}
</style>
...@@ -60,10 +60,10 @@ export default { ...@@ -60,10 +60,10 @@ export default {
this.submitLoading = true; this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => { request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功'); this.$message.success('关闭订单成功1');
this.refunOrderdModal.dialogVisible = false; this.refunOrderdModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList'); this.$emit('getList');
this.submitLoading = false;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
this.submitLoading = false; this.submitLoading = false;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="mall-content-section"> <div class="mall-content-section">
<div class="mall-content-title" style="border:none"> <div class="mall-content-title" style="border:none">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item> <el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>订单</el-breadcrumb-item> <el-breadcrumb-item>订单</el-breadcrumb-item>
<el-breadcrumb-item>优惠券兑换</el-breadcrumb-item> <el-breadcrumb-item>优惠券兑换</el-breadcrumb-item>
...@@ -26,12 +27,12 @@ ...@@ -26,12 +27,12 @@
</el-select> </el-select>
</div> --> </div> -->
<div class="search-item"> <div class="search-item">
<el-input v-model="searchValue" placeholder="请输入优惠券名称进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input> <el-input v-model="searchValue" style="width:260px;" placeholder="请输入会员/卡券/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div> </div>
</div> </div>
<div class="fr"> <div class="fr">
<el-button plain @click="exportExcel" v-if="integralMallProId"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button> <el-button @click="exportExcel" v-if="integralMallProId" type="primary"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
<el-button plain @click="exportExcelAll" v-else><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button> <el-button @click="exportExcelAll" v-else type="primary"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -51,13 +52,17 @@ ...@@ -51,13 +52,17 @@
<!-- 折扣券 --> <!-- 折扣券 -->
<!-- <img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" /> --> <!-- <img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" /> -->
<img v-if="scope.row.cardType === 2" src="../../../static/img/quan02.png" alt="" /> <!-- 兑换券 -->
<img v-if="scope.row.cardType === 0" src="../../../static/img/quan01.png" alt="" /> <img v-if="scope.row.giftMainPic" :src="scope.row.giftMainPic" alt="" />
<img v-if="scope.row.cardType === 1" src="../../../static/img/quan03.png" alt="" /> <img v-if="scope.row.cardType === 2 && !scope.row.giftMainPic" src="../../../static/img/quan02.png" alt="" />
<!-- 抵金券 -->
<img v-if="scope.row.cardType === 0 && !scope.row.giftMainPic" src="../../../static/img/quan01.png" alt="" />
<!-- 折扣券 -->
<img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="" />
<div class="info-name"> <div class="info-name">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p> <p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<!-- status: 1是未领取,2是已领取 --> <!-- status: <= 1是未领取,2是已领取 -->
<p style="font-size:13px;color:#909399"><span v-if="scope.row.cardType === 2">已领取</span><span v-if="scope.row.cardType <= 0">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p> <p style="font-size:13px;color:#909399"><span v-if="scope.row.status === 2">已领取</span><span v-if="scope.row.status <= 1">未领取</span> / <span v-if="scope.row.useStatus === 5">已使用</span><span v-if="scope.row.useStatus === 0">未使用</span></p>
<!-- <p class="category-ellipsis"> <!-- <p class="category-ellipsis">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span> <span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p> </p>
...@@ -72,7 +77,7 @@ ...@@ -72,7 +77,7 @@
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p> <p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="definedCode" label="订单编号"> <el-table-column prop="definedCode" label="订单编号" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list"> <el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span> <span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-"></i> </span>
......
...@@ -135,6 +135,7 @@ export default { ...@@ -135,6 +135,7 @@ export default {
deliveryContent: this.deliverdModal.changeType === 3 ? this.deliverdModal.content : '' //在线发货内容 deliveryContent: this.deliverdModal.changeType === 3 ? this.deliverdModal.content : '' //在线发货内容
}; };
if (this.deliverdModal.changeType === 3) { if (this.deliverdModal.changeType === 3) {
//在线发货
params.logisticsCompanyId = ''; params.logisticsCompanyId = '';
params.logisticsCompanyCode = ''; params.logisticsCompanyCode = '';
params.logisticsCompanyName = ''; params.logisticsCompanyName = '';
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div style="float:right;margin-top:-20px;"> <div style="float:right;margin-top:-20px;">
<el-button type="text" v-show="!editStatus" @click="editLogisticsInfo">修改运单编号</el-button> <el-button type="text" v-show="!editStatus" @click="editLogisticsInfo">修改运单编号</el-button>
<el-button type="text" v-show="editStatus" @click="updateLogisticsInfo">确认</el-button> <el-button type="text" v-show="editStatus" @click="updateLogisticsInfo">确认1</el-button>
<el-button type="text" v-show="editStatus" @click="cancelLogisticsInfo">取消</el-button> <el-button type="text" v-show="editStatus" @click="cancelLogisticsInfo">取消</el-button>
</div> </div>
</div> </div>
...@@ -166,6 +166,7 @@ export default { ...@@ -166,6 +166,7 @@ export default {
courierNumber: this.temDeliverInfodModal.courierNumber, courierNumber: this.temDeliverInfodModal.courierNumber,
logisticsCompanyName: this.otherLogistics ? this.temDeliverInfodModal.otherLogisticsCompanyName : this.logisticsCompanyName //物流公司名称 logisticsCompanyName: this.otherLogistics ? this.temDeliverInfodModal.otherLogisticsCompanyName : this.logisticsCompanyName //物流公司名称
}; };
return false
request.get('/api-integral-mall/order-opt', { params }).then(res => { request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) { if (res.data.errorCode === 0) {
this.$message.success('发货成功'); this.$message.success('发货成功');
......
<template> <template>
<el-dialog title="导入失败原因" :visible.sync="importInfo.dialogVisible" width="420px"> <el-dialog title="导入失败原因" :visible.sync="importInfo.dialogVisible" width="420px">
<div class="info-content"> <div class="info-content" style="height:400px;overflow-y:auto">
<div v-for="(item, index) in importInfo.list" :key="index" class="list-content"> <div v-for="(item, index) in importInfo.list" :key="index" class="list-content">
<span class="reason-info">{{ item.orderNumber }}</span> <span class="reason-info">{{ item.orderNumber }}</span>
<span class="sku-info">{{ item.errorMessage }}</span> <span class="sku-info">{{ item.errorMessage }}</span>
...@@ -27,7 +27,9 @@ export default { ...@@ -27,7 +27,9 @@ export default {
.sku-info { .sku-info {
font-size: 13px; font-size: 13px;
color: #606266; color: #606266;
margin: 15px 0 5px 15px; margin-left: 10px;
vertical-align: top;
width: 280px;
display: inline-block; display: inline-block;
word-break: break-all; word-break: break-all;
} }
...@@ -35,6 +37,9 @@ export default { ...@@ -35,6 +37,9 @@ export default {
color: #303133; color: #303133;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
word-break: break-all;
width: 80px;
display: inline-block;
} }
.list-content { .list-content {
margin-bottom: 15px; margin-bottom: 15px;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-form-item label="选择文件" required> <el-form-item label="选择文件" required>
<div> <div>
<div class="upload-btn"> <div class="upload-btn">
<el-upload class="upload-ele" :action="action" :before-upload="uploadFileBefore" :on-success="uploadFile" with-credentials :show-file-list="showList" :data="uploadData"> <el-upload class="upload-ele" :action="action" :headers="headersUpload" :before-upload="uploadFileBefore" :on-success="uploadFile" with-credentials :show-file-list="showList" :data="uploadData">
<el-button size="small"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button> <el-button size="small"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
</el-upload> </el-upload>
</div> </div>
...@@ -44,6 +44,9 @@ export default { ...@@ -44,6 +44,9 @@ export default {
return { return {
action: window.location.origin + '/api-integral-mall/upload-order-ship?requestProject=intergral-mall', action: window.location.origin + '/api-integral-mall/upload-order-ship?requestProject=intergral-mall',
// action: 'http://gicdev.demogic.com/api-integral-mall/upload-order-ship?requestProject=intergral-mall', // action: 'http://gicdev.demogic.com/api-integral-mall/upload-order-ship?requestProject=intergral-mall',
headersUpload: {
sign: ''
},
dialogForm: {}, dialogForm: {},
errorList: [], errorList: [],
showList: false, showList: false,
...@@ -75,6 +78,11 @@ export default { ...@@ -75,6 +78,11 @@ export default {
this.$message.error('请上传小于2MB的文件'); this.$message.error('请上传小于2MB的文件');
return false; return false;
} }
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
this.headersUpload.sign = '';
}
this.loading = true; this.loading = true;
this.fileName = file.name; this.fileName = file.name;
}, },
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="mall-content-section"> <div class="mall-content-section">
<div class="mall-content-title" style="border:none"> <div class="mall-content-title" style="border:none">
<el-breadcrumb separator="/"> <el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item> <el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>订单</el-breadcrumb-item> <el-breadcrumb-item>订单</el-breadcrumb-item>
<el-breadcrumb-item>退款列表</el-breadcrumb-item> <el-breadcrumb-item>退款列表</el-breadcrumb-item>
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<div class="goods-list-content"> <div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading"> <el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<el-table-column type="selection" width="40"> </el-table-column> <el-table-column type="selection" width="40"> </el-table-column>
<el-table-column label="礼品信息" min-width="220px"> <el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="gift-info"> <div class="gift-info">
<img :src="scope.row.photoUrl" /> <img :src="scope.row.photoUrl" />
...@@ -107,7 +108,8 @@ ...@@ -107,7 +108,8 @@
<p style="line-height:18px;" v-if="scope.row.refundStatus === 2">退款关闭</p> <p style="line-height:18px;" v-if="scope.row.refundStatus === 2">退款关闭</p>
<p style="line-height:18px"> <p style="line-height:18px">
<el-button type="text" v-if="scope.row.refundStatus === 0" @click="handleArgeeRefund(scope.row)">同意</el-button> <el-button type="text" v-if="scope.row.refundStatus === 0" @click="handleArgeeRefund(scope.row)">同意</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0" @click="handleDeliver(scope.row)">发货</el-button> <el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0 && scope.row.changeType !== 4" @click="handleDeliver(scope.row)">发货</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0 && scope.row.changeType === 4" @click="deliverShop(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.refundType === 2 && scope.row.refundStatus === 0" @click="handleCloseRefund(scope.row)">关闭</el-button> <el-button type="text" v-if="scope.row.refundType === 2 && scope.row.refundStatus === 0" @click="handleCloseRefund(scope.row)">关闭</el-button>
</p> </p>
</template> </template>
...@@ -129,6 +131,17 @@ ...@@ -129,6 +131,17 @@
</div> </div>
</el-tabs> </el-tabs>
</div> </div>
<!-- 门店自提核销 -->
<el-dialog title="发货并核销" :visible.sync="shopDialogVisible" width="450px">
<p style="margin-bottom:20px">
请确认买家出示的提货码为:<span style="color:#f5222d">{{ writeOffCode }}</span>
</p>
<p style="margin-bottom:20px">确认无误后,将商品交付给买家,确认核销,则订单交易完成</p>
<span slot="footer" class="dialog-footer">
<el-button @click="shopDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="hanhdleShopDeliver" :loading="submitLoading">确 定</el-button>
</span>
</el-dialog>
<!-- 关闭退款单 --> <!-- 关闭退款单 -->
<closeRefund :refundModal="refundModal" @getList="getList"></closeRefund> <closeRefund :refundModal="refundModal" @getList="getList"></closeRefund>
<!-- 同意退款 --> <!-- 同意退款 -->
...@@ -192,7 +205,11 @@ export default { ...@@ -192,7 +205,11 @@ export default {
logisticsCompanyId: '', logisticsCompanyId: '',
logisticsCode: '', logisticsCode: '',
otherLogisticsCompanyName: '' otherLogisticsCompanyName: ''
} },
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false //门店自提确认按钮
}; };
}, },
created() { created() {
...@@ -309,6 +326,38 @@ export default { ...@@ -309,6 +326,38 @@ export default {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); });
},
// 门店自提发货
deliverShop(item) {
this.shopDialogVisible = true;
this.shopIntegralMallProExchangeId = item.integralMallProExchangeId;
this.writeOffCode = item.writeOffCode;
},
// 确认门店自提
hanhdleShopDeliver(item) {
let params = {
optType: 1,
integralMallProExchangeId: this.shopIntegralMallProExchangeId,
logisticsCompanyId: '',
logisticsCompanyCode: '',
logisticsCompanyName: '',
courierNumber: '',
cancelReason: '',
deliveryContent: '',
changeType: 4
};
this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货核销成功');
this.shopDialogVisible = false;
this.getList();
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} }
}, },
components: { components: {
......
<template>
<div class="mall-section-container">
<div class="mall-content-section">
<div class="mall-content-title">
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
<el-breadcrumb-item>积分商城</el-breadcrumb-item>
<el-breadcrumb-item>设置</el-breadcrumb-item>
<el-breadcrumb-item>配送设置</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>配送设置</span>
</h3>
</div>
<div class="section">
<div class="header-top">
<span>门店自提</span>
<el-switch v-model="pickStatus" @change="changeStatus"> </el-switch>
</div>
<div v-show="pickStatus">
<div class="operate-top">
<div class="fl">
<div class="search-item">
<el-input v-model="searchValue" placeholder="请输入自提点名称进行搜索" prefix-icon="el-icon-search" clearable class="w-280" @keyup.enter.native="getSearchList" @clear="getSearchList"> </el-input>
</div>
</div>
<div class="fr">
<el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointPhone" label="联系电话"> </el-table-column>
<el-table-column prop="canChooseTime" label="自提时间可选">
<template slot-scope="scope">
<span>{{ scope.row.canChooseTime === 1 ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<div>
<el-button type="text" @click="goAdd(scope.row)">编辑</el-button>
<el-popover placement="top" width="160" v-model="scope.row.visible2" style="margin-left:8px">
<p style="line-height:1.5;padding: 10px 10px 20px;">确定删除该自提点吗?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="scope.row.visible2 = false">取消</el-button>
<el-button type="primary" size="mini" @click="deletePoint(scope.row)">确定</el-button>
</div>
<el-button slot="reference" type="text">删除</el-button>
</el-popover>
</div>
</template>
</el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div class="pagination-conteiner" v-show="tableDate.length > 0">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</div>
</div>
<!-- 自提点设置 -->
<pickedAuto :pickedForm="pickedForm" @getList="getList"></pickedAuto>
</div>
</template>
<script>
import qs from 'qs';
import request from '../../service/request.js';
// import getInputVal from '../../../utils/common.js';
// import stockModal from '../../../components/getSkuList';
import pickedAuto from './pickedAuto';
export default {
data() {
return {
searchValue: '',
currentPage: 1,
pageSizes: [20, 30, 50],
pageSize: 20,
total: 2,
pickStatus: true, //自提状态
loading: false,
selectList: [], //复选框选中的数据
tableDate: [],
pickedForm: {
dialogVisible: false,
selectIdList: [], //复选框选中的数据的id
list: [{ timeRange: [] }] //初始数据
}
};
},
created() {
this.getStatus();
},
methods: {
getSearchList() {
this.currentPage = 1;
this.getList();
},
//分页设置每页的数量
handleSizeChange(size) {
this.pageSize = size;
this.getList();
},
// 分页设置跳转到第几页
handleCurrentChange(page) {
this.currentPage = page;
this.getList();
},
//复选
handleSelectAll(val) {
this.selectList = val;
},
// 自提设置
setPicked() {
if (this.selectList.length < 1) {
this.$message.error('请先选择自提点');
return false;
} else {
this.pickedForm.selectIdList = [];
for (let item of this.selectList) {
this.pickedForm.selectIdList.push(item.integralMallPickUpPointId);
}
let currentTime = new Date(new Date().valueOf());
let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.pickedModal.timeRangeList[0].timeRange = [currentTime, currentTime1];
this.pickedForm.list[0].timeRange = [currentTime, currentTime1];
this.pickedForm.dialogVisible = true;
}
},
//获取自提点状态
getStatus() {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
this.pickStatus = false;
} else if (res.data.result.status === 1) {
this.pickStatus = true;
}
this.getList();
} else {
this.$message.error(res.data.message);
}
});
},
// 修改自提点状态
changeStatus() {
let params = {
status: this.pickStatus ? 1 : 0
};
request.get('/api-integral-mall/set-pick-up-point-switch-status', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('设置成功');
this.getList();
} else {
this.pickStatus = true;
this.$message.error(res.data.message);
}
});
},
//删除自提点
deletePoint(item) {
let params = {
integralMallPickUpPointId: item.integralMallPickUpPointId
};
request.get('/api-integral-mall/delete-pick-up-point', { params }).then(res => {
if (res.data.errorCode === 0) {
this.getList();
} else {
this.$message.error(res.data.message);
}
});
},
getList() {
let params = {
currentPage: this.currentPage,
pageSize: this.pageSize,
search: this.searchValue
};
this.loading = true;
request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.result) {
this.tableDate = res.data.result.result;
this.total = res.data.result.totalCount;
} else {
this.tableDate = [];
this.total = 0;
}
this.loading = false;
} else {
this.$message.error(res.data.message);
this.loading = false;
}
});
},
// 新增
addStore() {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: '-1' } });
},
// 编辑
goAdd(item) {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
}
},
components: {
pickedAuto
}
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px;
}
.header-top {
margin: 15px 0 22px 0;
}
.header-top span {
width: 80px;
display: inline-block;
}
</style>
...@@ -40,10 +40,6 @@ ...@@ -40,10 +40,6 @@
content: "\e635"; content: "\e635";
} }
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before { .icon-lipin:before {
content: "\e78a"; content: "\e78a";
} }
...@@ -56,6 +52,10 @@ ...@@ -56,6 +52,10 @@
content: "\e615"; content: "\e615";
} }
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before { .icon-xinxixianshi:before {
content: "\e74f"; content: "\e74f";
} }
......
...@@ -38,9 +38,6 @@ Created by iconfont ...@@ -38,9 +38,6 @@ Created by iconfont
<glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" /> <glyph glyph-name="shangpin" unicode="&#58933;" d="M891.303669 896h-759.406713C59.153786 896 0 836.846214 0 764.103044v-760.206088c0-72.743169 59.153786-131.896956 131.896956-131.896956h760.206088c72.743169 0 131.896956 59.153786 131.896956 131.896956V764.103044C1023.200625 836.846214 964.046838 896 891.303669 896zM73.542545 647.394223c18.385636-9.592506 38.370023-14.388759 58.354411-14.388759h760.206088c19.984387 0 39.968774 4.796253 58.354411 14.388759v-642.697892c0-31.97502-26.379391-58.354411-58.354411-58.354411H131.896956c-31.97502 0-58.354411 26.379391-58.354411 58.354411V647.394223z m817.761124 58.354411h-759.406713c-31.97502 0-58.354411 26.379391-58.354411 58.35441s26.379391 58.354411 58.354411 58.354411h760.206088c31.97502 0 58.354411-26.379391 58.354411-58.354411-0.799375-31.97502-26.379391-58.354411-59.153786-58.35441zM224.624512 367.612802c19.185012-143.887588 141.489461-251.803279 286.9758-251.803278s268.590164 107.915691 286.9758 251.803278c21.583138 11.990632 34.373146 34.373146 34.373146 59.153787 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-21.583138 10.391881-42.366901 27.978143-55.156909C708.246682 266.891491 617.117877 188.552693 511.600312 188.552693s-196.64637 78.338798-213.433255 183.056987c17.586261 12.790008 27.978142 33.57377 27.978142 55.156909 0 37.570648-30.376269 67.946916-67.946916 67.946916s-67.946916-30.376269-67.946917-67.946916c0-24.78064 12.790008-47.163154 34.373146-59.153787z" horiz-adv-x="1024" />
<glyph glyph-name="tupian" unicode="&#58902;" d="M324.3 358.9c-57.9 0-105 47.1-105 105s47.1 105 105 105 105-47.1 105-105-47.1-105-105-105z m0 168c-34.7 0-63-28.3-63-63s28.3-63 63-63 63 28.3 63 63-28.3 63-63 63zM560.1-5.5c-5.4 0-10.7 2.1-14.8 6.2L344.9 201c-10.2 10.2-26.9 10.2-37.1 0L163.1 56.3c-8.2-8.2-21.5-8.2-29.7 0s-8.2 21.5 0 29.7l144.7 144.7c26.6 26.6 69.9 26.6 96.5 0L575 30.3c8.2-8.2 8.2-21.5 0-29.7-4.1-4.1-9.5-6.1-14.9-6.1zM414 150.3c-5.4 0-10.7 2.1-14.8 6.2-8.2 8.2-8.2 21.5 0 29.7l248.3 248.3c31 31 81.5 31 112.4 0l144.3-144.3c8.2-8.2 8.2-21.5 0-29.7s-21.5-8.2-29.7 0L730.2 404.7c-14.6 14.6-38.4 14.6-53.1 0L428.9 156.5c-4.1-4.1-9.5-6.2-14.9-6.2zM806-15H218c-57.9 0-105 47.1-105 105V678c0 57.9 47.1 105 105 105h588c57.9 0 105-47.1 105-105v-588c0-57.9-47.1-105-105-105zM218 741c-34.7 0-63-28.3-63-63v-588c0-34.7 28.3-63 63-63h588c34.7 0 63 28.3 63 63V678c0 34.7-28.3 63-63 63H218z" horiz-adv-x="1024" />
<glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" /> <glyph glyph-name="lipin" unicode="&#59274;" d="M867.54211 618.19181h-51.287083l8.377808 12.262278c12.262278 18.388812 24.520463 49.04195 18.388812 73.56139 0 24.51637-18.388812 49.036833-36.779671 61.301157-30.652114 18.388812-61.299111 18.388812-98.083899 12.257162-73.558319-18.389836-147.120732-79.68997-190.030008-140.989081l-6.132674-6.131651-6.126534 6.131651C462.959585 697.88485 389.398196 759.184985 315.83476 777.57482c-36.779671 12.262278-67.431785 6.130627-98.078783-12.257161-24.520463-12.264325-36.779671-36.783765-36.779671-61.301158 0-24.520463 6.126534-49.04195 18.388812-73.56139l6.636141-12.262278h-49.546439c-42.909276 0-73.562413-30.648021-73.562413-73.558319v-125.059274c0-30.652114 24.520463-61.299111 55.168484-67.430762V23.60793c0-42.909276 30.652114-73.561389 73.563436-73.56139h300.371068v-0.005116h300.377208c42.911322 0 73.558319 30.652114 73.55832 73.562413V315.35355c0 12.259208-0.402159 36.783765-0.40216 36.783765h6.533811c24.520463 6.131651 49.04195 36.779671 49.041949 67.430762V544.63349c0.001023 42.910299-30.652114 73.558319-73.562413 73.55832zM247.995699 724.858178c20.23281 15.017018 38.60832 9.81146 61.918211 3.979638C359.030561 711.687204 393.106658 678.658973 438.500521 638.114558l22.415522-21.559015H268.729929c-17.483186 23.312962-35.890418 47.548946-35.890418 76.689637-0.001023 17.483186 3.501754 19.956517 15.156188 31.612998zM136.968 441.401338v91.212398c0 17.655102 17.649985 35.305087 35.305087 35.305087h313.856197v-161.823596H172.273087c-23.539112 0-35.305087 17.649985-35.305087 35.306111zM486.92337 1.532145H220.53937c-22.733771 0-34.099632 11.368932-34.099632 34.102703V318.042799c0 17.052374 17.052374 34.104749 34.104749 34.104749H486.92337v-350.615403z m93.225241 631.372761c34.651194 34.640961 82.243119 71.724555 138.027634 94.402044 23.090904 5.77247 36.166711 4.90573 59.463299-6.126534 10.420327-9.81146 14.090926-15.172561 14.090927-32.489972 0-23.096021-22.522969-54.402027-39.842427-71.725578H565.537845l14.610766 15.94004z m257.409605-597.270058c0-17.052374-17.051351-34.102702-34.102703-34.102703h-261.4752v350.615403h261.4752c17.056468 0 34.102702-17.056468 34.102703-34.104749v-282.407951z m47.049572 405.030733c0-17.897625-17.897625-35.800367-35.795251-35.800368H540.282648V569.14986h308.529889c17.892509 0 35.795251-17.902742 35.795251-35.802414v-92.681865z" horiz-adv-x="1024" />
...@@ -50,6 +47,9 @@ Created by iconfont ...@@ -50,6 +47,9 @@ Created by iconfont
<glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" /> <glyph glyph-name="daifahuo" unicode="&#58901;" d="M329.318 324.833c15.114 0 27.361 12.268 27.361 27.341V502.149c0 15.114-12.247 27.361-27.361 27.361s-27.341-12.247-27.341-27.361v-122.593h-117.74c-15.135 0-27.361-12.268-27.361-27.382 0-15.073 12.227-27.341 27.361-27.341h145.08zM721.244 214.835c-73.605 0-134.717-54.415-145.285-125.092H448.983c-10.547 70.676-71.66 125.092-145.244 125.092-80.978 0-146.862-65.884-146.862-146.883 0-80.957 65.884-146.862 146.862-146.862 69.652 0 128.143 48.742 143.135 113.91h131.195c14.991-65.188 73.523-113.91 143.155-113.91 80.957 0 146.842 65.905 146.842 146.862 0.02 80.998-65.864 146.883-146.821 146.883zM303.739-24.207c-50.811 0-92.16 41.37-92.16 92.16s41.349 92.16 92.16 92.16 92.16-41.37 92.16-92.16-41.349-92.16-92.16-92.16z m417.505 0c-50.811 0-92.14 41.37-92.14 92.16s41.329 92.16 92.14 92.16c50.77 0 92.14-41.37 92.14-92.16s-41.37-92.16-92.14-92.16zM1003.418 751.186c-2.191 29.635-14.029 54.129-34.243 70.82-33.26 27.464-77.578 25.395-88.023 24.453l-485.028-0.819c-38.953 0-60.908-15.626-72.458-28.754-23.04-26.132-21.914-59.802-21.094-69.12v-93.614l-222.72-117.76c-51.589-22.303-58.88-87.06-59.167-89.825a26.218 26.218 0 0 1-0.143-2.826l-0.061-375.849c0-15.114 12.247-27.341 27.341-27.341 15.114 0 27.361 12.227 27.361 27.32l0.061 373.965c1.004 6.144 6.84 36.311 26.808 44.564a24.372 24.372 0 0 1 2.335 1.085l238.305 125.993a27.361 27.361 0 0 1 14.561 24.207V749.158c0 1.311 0 2.089-0.184 3.359-0.492 5.12-0.041 19.702 7.782 28.426 6.001 6.636 16.486 9.994 31.293 9.994h0.061l486.339 0.819c1.044 0 2.109 0.041 3.133 0.184 0.266 0.02 30.597 2.785 48.62-12.104 8.479-7.004 13.23-17.388 14.479-31.724v-680.12c0-15.094 12.227-27.341 27.341-27.341s27.402 12.206 27.402 27.3V749.157a33.572 33.572 0 0 1-0.102 2.028z" horiz-adv-x="1024" />
<glyph glyph-name="shezhi" unicode="&#58979;" d="M245.921684 33.684211a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894737h138.13221z m377.263158 377.263157a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894736h-84.237473a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 1 0 0 53.894736h515.395368z m-377.263158 377.263158a107.789474 107.789474 0 0 0 208.788211 0H916.210526a26.947368 26.947368 0 1 0 0-53.894737H454.709895a107.789474 107.789474 0 0 0-208.788211 0H107.789474a26.947368 26.947368 0 0 0 0 53.894737h138.13221zM350.315789 707.368421a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z m-377.263158-377.263158a53.894737 53.894737 0 1 1 0 107.789474 53.894737 53.894737 0 0 1 0-107.789474z" horiz-adv-x="1024" />
<glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" /> <glyph glyph-name="xinxixianshi" unicode="&#59215;" d="M486.4 477.696h68.096V128H486.4V477.696zM512-42.496c239.104 0 426.496 187.904 426.496 426.496S751.104 810.496 512 810.496 85.504 623.104 85.504 384s187.392-426.496 426.496-426.496z m0-85.504C230.4-128 0 102.4 0 384S230.4 896 512 896s512-230.4 512-512-230.4-512-512-512zM520.704 568.32m-51.2 0a51.2 51.2 0 1 1 102.4 0 51.2 51.2 0 1 1-102.4 0Z" horiz-adv-x="1024" />
......
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