Skip to content

I
integral-mall
Commit 866f3f99 by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !44
parents 63e89c17 25e0dad7
Showing with 3115 additions and 115 deletions
dist/index.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.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>
\ 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=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
dist/static/css/app.ad982c664928a8a1b84619d3d4948ae7.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.c59732585a037ce3398a2b868ac2b6f4.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/iconfont.css
......@@ -40,10 +40,6 @@
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -56,6 +52,10 @@
content: "\e615";
}
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
......
dist/static/fonts/iconfont.js
!function(l){var c,e='<svg><symbol id="icon-dingdan" viewBox="0 0 1024 1024"><path d="M955.181146 174.654683c0-2.658678 0-5.112842-0.204513-7.771519-1.636109-45.811065-33.540244-86.10026-78.32874-95.303376-18.815259-3.88576-38.857599-2.863192-58.286399-3.067705-19.224286-0.204514-34.153785 15.54304-33.949271 34.153785 0.204514 18.815259 15.338526 33.540244 34.767326 33.540243 11.248252 0 22.701019-0.204514 33.949271 0 11.043739 0.204514 20.042341 4.703815 26.791292 13.497903 5.930897 7.77152 7.157979 16.565608 7.157979 25.973238v740.748552c0 23.519073-13.90693 37.835031-37.016977 37.835031H173.529858c-22.291991 0-36.607949-14.520471-36.607949-36.812463V172.200519c0-22.087478 14.315958-36.403435 36.198922-36.607949 11.248252 0 22.701019 0.204514 33.949271-0.204513 17.383663-0.613541 31.290593-14.724985 32.108648-32.517676 0.818055-17.179149-11.452766-33.744757-28.427402-34.767325-17.79269-1.227082-35.994408-1.840623-53.582584 0.613541-53.173557 7.567006-88.145396 49.696824-88.34991 103.483922v746.679449c0 58.081885 45.197523 103.279409 102.870381 103.279409h680.826044c14.724985 0 29.245456-2.658678 42.538845-9.203116 40.289195-19.837827 60.331536-52.560016 60.331536-97.348512-0.204514-246.438985-0.204514-493.696026-0.204514-740.953066z m0 0" ></path><path d="M379.066107 204.513681h132.933893c45.811065 0 91.417615 0.409027 137.22868-0.204514 38.244058-0.409027 66.875974-30.268025 67.080487-68.512083 0.204514-21.882964 0-43.765928 0-65.648891 0-40.493709-29.44997-69.943679-70.148192-69.943679H377.429998c-41.10725 0-70.148193 29.040943-70.352706 70.352706v62.172159c0.204514 43.152387 28.836429 71.579788 71.988815 71.784302z m-3.067705-135.797084h272.003196V135.797084h-272.003196V68.716597z m0 0" ></path><path d="M309.940483 545.437987c-2.658678 0-5.112842 0.204514-7.77152 0.613541-14.111444 2.24965-23.723587 10.430198-27.609346 24.132614-3.88576 13.702417-0.409027 25.56421 10.430197 35.176353 7.362493 6.748951 16.565608 8.385061 26.177751 8.385061H710.37827c4.294787 0 8.589575-0.204514 12.679849-0.818055 14.520471-2.454164 26.177751-15.54304 27.200319-30.268024 1.431596-21.473936-13.90693-37.016976-36.812462-37.016977-134.570002-0.204514-268.93549-0.204514-403.505493-0.204513z m0 0M307.690833 784.105452h332.130218c25.768724 0 51.332934 0.204514 77.101657 0 18.815259-0.204514 33.33573-15.134012 33.33573-33.949271 0-19.837827-15.134012-33.949271-36.403435-33.949271H308.304374c-11.248252 0-20.860395 3.88576-27.813861 12.884362-8.589575 11.043739-10.02117 23.31456-4.090273 35.789894 6.339924 12.679848 16.974636 19.224286 31.290593 19.224286z m0 0M307.895347 443.181146c60.331536 0.204514 120.663072 0 180.994607 0h90.395047c16.565608 0 30.063511-10.634711 33.744757-25.973237 5.112842-21.882964-10.634711-41.925305-33.540243-42.129818-45.197523-0.204514-90.395047 0-135.592571 0h-135.59257c-15.54304 0-27.813861 8.589575-32.926703 22.087477-8.589575 22.701019 7.976034 45.811065 32.517676 46.015578z m0 0" ></path></symbol><symbol id="icon-icon-" viewBox="0 0 1024 1024"><path d="M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-960C265.6 64 64 265.6 64 512s201.6 448 448 448 448-201.6 448-448S758.4 64 512 64z" ></path><path d="M512 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M768 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M256 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path></symbol><symbol id="icon-youhuiquan" viewBox="0 0 1024 1024"><path d="M508 479.9c-5.4 0-10.7-2-14.8-6.2L391.4 371.9c-8.2-8.2-8.2-21.5 0-29.7s21.5-8.2 29.7 0L522.9 444c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M508.7 479.9c-5.4 0-10.7-2-14.8-6.2-8.2-8.2-8.2-21.5 0-29.7l101.8-101.8c8.2-8.2 21.5-8.2 29.7 0s8.2 21.5 0 29.7L523.6 473.7c-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M624 514.7H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21zM624 627.2H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21z" fill="" ></path><path d="M514.6 687.9c-11.6 0-21-9.4-21-21V487.4c0-11.6 9.4-21 21-21s21 9.4 21 21v179.5c0 11.6-9.4 21-21 21z" fill="" ></path><path d="M883.8 877H140.2C99.3 877 66 843.7 66 802.8V677.9c0-10 7-18.6 16.8-20.6 68.6-14 118.5-75.1 118.5-145.3S151.4 380.7 82.8 366.7c-9.8-2-16.8-10.6-16.8-20.6V221.2c0-40.9 33.3-74.2 74.2-74.2h743.5c40.9 0 74.2 33.3 74.2 74.2v124.9c0 10-7 18.6-16.8 20.6-68.6 14-118.5 75.1-118.5 145.3s49.8 131.3 118.5 145.3c9.8 2 16.8 10.6 16.8 20.6v124.9c0.1 40.9-33.2 74.2-74.1 74.2zM108 694.2v108.6c0 17.8 14.5 32.2 32.2 32.2h743.5c17.8 0 32.2-14.5 32.2-32.2V694.2c-35.7-10.8-67.8-32.1-91.8-61.1-28-34-43.5-77-43.5-121.1s15.4-87.1 43.5-121.1c24-29 56.1-50.3 91.8-61.1V221.2c0-17.8-14.5-32.2-32.2-32.2H140.2c-17.8 0-32.2 14.5-32.2 32.2v108.6c35.7 10.8 67.8 32.1 91.8 61.1 28 34 43.5 77 43.5 121.1s-15.4 87.1-43.5 121.1c-24 29-56.1 50.3-91.8 61.1z" fill="" ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1089 1024"><path d="M535.744 455.936h-535.68v114.112h535.68V455.936z m489.28 389.952H1.28V960h1023.744v-114.112z m-260.096-145.472V320l260.096 190.208-260.096 190.208zM1025.024 64H2.624v116.096h1022.4V64z" fill="#979797" ></path></symbol><symbol id="icon-shouqi" viewBox="0 0 1088 1024"><path d="M489.536 455.936h535.68v114.112H489.6V455.936zM0.256 845.888H1024V960H0.256v-114.112z m260.096-145.472V320L0.256 510.208l260.096 190.208zM0.256 64h1022.4v116.096H0.256V64z" fill="#979797" ></path></symbol><symbol id="icon-shangpin" viewBox="0 0 1024 1024"><path d="M891.303669 0h-759.406713C59.153786 0 0 59.153786 0 131.896956v760.206088c0 72.743169 59.153786 131.896956 131.896956 131.896956h760.206088c72.743169 0 131.896956-59.153786 131.896956-131.896956V131.896956C1023.200625 59.153786 964.046838 0 891.303669 0zM73.542545 248.605777c18.385636 9.592506 38.370023 14.388759 58.354411 14.388759h760.206088c19.984387 0 39.968774-4.796253 58.354411-14.388759v642.697892c0 31.97502-26.379391 58.354411-58.354411 58.354411H131.896956c-31.97502 0-58.354411-26.379391-58.354411-58.354411V248.605777z 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.35441z" ></path><path d="M224.624512 528.387198c19.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 629.108509 617.117877 707.447307 511.600312 707.447307s-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" ></path></symbol><symbol id="icon-tupian" viewBox="0 0 1024 1024"><path d="M324.3 537.1c-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 901.5c-5.4 0-10.7-2.1-14.8-6.2L344.9 695c-10.2-10.2-26.9-10.2-37.1 0L163.1 839.7c-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 865.7c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.1-14.9 6.1z" ></path><path d="M414 745.7c-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 491.3c-14.6-14.6-38.4-14.6-53.1 0L428.9 739.5c-4.1 4.1-9.5 6.2-14.9 6.2z" ></path><path d="M806 911H218c-57.9 0-105-47.1-105-105V218c0-57.9 47.1-105 105-105h588c57.9 0 105 47.1 105 105v588c0 57.9-47.1 105-105 105zM218 155c-34.7 0-63 28.3-63 63v588c0 34.7 28.3 63 63 63h588c34.7 0 63-28.3 63-63V218c0-34.7-28.3-63-63-63H218z" ></path></symbol><symbol id="icon-lipin" viewBox="0 0 1024 1024"><path d="M867.54211 277.80819h-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 198.11515 389.398196 136.815015 315.83476 118.42518c-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.558319v125.059274c0 30.652114 24.520463 61.299111 55.168484 67.430762V872.39207c0 42.909276 30.652114 73.561389 73.563436 73.56139h300.371068v0.005116h300.377208c42.911322 0 73.558319-30.652114 73.55832-73.562413V580.64645c0-12.259208-0.402159-36.783765-0.40216-36.783765h6.533811c24.520463-6.131651 49.04195-36.779671 49.041949-67.430762V351.36651c0.001023-42.910299-30.652114-73.558319-73.562413-73.55832zM247.995699 171.141822c20.23281-15.017018 38.60832-9.81146 61.918211-3.979638C359.030561 184.312796 393.106658 217.341027 438.500521 257.885442l22.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 454.598662v-91.212398c0-17.655102 17.649985-35.305087 35.305087-35.305087h313.856197v161.823596H172.273087c-23.539112 0-35.305087-17.649985-35.305087-35.306111zM486.92337 894.467855H220.53937c-22.733771 0-34.099632-11.368932-34.099632-34.102703V577.957201c0-17.052374 17.052374-34.104749 34.104749-34.104749H486.92337v350.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.4752v-350.615403h261.4752c17.056468 0 34.102702 17.056468 34.102703 34.104749v282.407951z m47.049572-405.030733c0 17.897625-17.897625 35.800367-35.795251 35.800368H540.282648V326.85014h308.529889c17.892509 0 35.795251 17.902742 35.795251 35.802414v92.681865z" ></path></symbol><symbol id="icon-icon_yunxiazai" viewBox="0 0 1024 1024"><path d="M790.528 409.6c-18.432-141.824-136.704-252.416-278.528-252.416S251.904 267.264 233.472 409.6C117.76 417.28 25.6 517.12 25.6 637.952c0 125.952 99.84 228.864 220.672 228.864h533.504c120.832-2.56 218.112-102.4 218.112-228.864C998.4 517.12 906.24 417.28 790.528 409.6z m-286.208 389.12l-194.56-223.232h131.584V367.616h125.952v207.872h131.584l-194.56 223.232z" fill="" ></path></symbol><symbol id="icon-daifahuo" viewBox="0 0 1024 1024"><path d="M329.318 571.167c15.114 0 27.361-12.268 27.361-27.341V393.851c0-15.114-12.247-27.361-27.361-27.361s-27.341 12.247-27.341 27.361v122.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 681.165c-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 920.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.16z" ></path><path d="M1003.418 144.814c-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.12v93.614l-222.72 117.76c-51.589 22.303-58.88 87.06-59.167 89.825a26.218 26.218 0 0 0-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 0 2.335-1.085l238.305-125.993a27.361 27.361 0 0 0 14.561-24.207V146.842c0-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.724v680.12c0 15.094 12.227 27.341 27.341 27.341s27.402-12.206 27.402-27.3V146.843a33.572 33.572 0 0 0-0.102-2.028z" ></path></symbol><symbol id="icon-xinxixianshi" viewBox="0 0 1024 1024"><path d="M486.4 418.304h68.096V768H486.4V418.304z" fill="" ></path><path d="M512 938.496c239.104 0 426.496-187.904 426.496-426.496S751.104 85.504 512 85.504 85.504 272.896 85.504 512s187.392 426.496 426.496 426.496z m0 85.504C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z" fill="" ></path><path d="M520.704 327.68m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z" fill="" ></path></symbol></svg>',t=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(t&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(e=c,h=l.document,i=!1,a=function(){i||(i=!0,e())},(o=function(){try{h.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}a()})(),h.onreadystatechange=function(){"complete"==h.readyState&&(h.onreadystatechange=null,a())});var e,h,i,a,o}(function(){var c,t;(c=document.createElement("div")).innerHTML=e,e=null,(t=c.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",function(c,t){t.firstChild?function(c,t){t.parentNode.insertBefore(c,t)}(c,t.firstChild):t.appendChild(c)}(t,document.body))})}(window);
\ No newline at end of file
!function(n){var c,a='<svg><symbol id="icon-dingdan" viewBox="0 0 1024 1024"><path d="M955.181146 174.654683c0-2.658678 0-5.112842-0.204513-7.771519-1.636109-45.811065-33.540244-86.10026-78.32874-95.303376-18.815259-3.88576-38.857599-2.863192-58.286399-3.067705-19.224286-0.204514-34.153785 15.54304-33.949271 34.153785 0.204514 18.815259 15.338526 33.540244 34.767326 33.540243 11.248252 0 22.701019-0.204514 33.949271 0 11.043739 0.204514 20.042341 4.703815 26.791292 13.497903 5.930897 7.77152 7.157979 16.565608 7.157979 25.973238v740.748552c0 23.519073-13.90693 37.835031-37.016977 37.835031H173.529858c-22.291991 0-36.607949-14.520471-36.607949-36.812463V172.200519c0-22.087478 14.315958-36.403435 36.198922-36.607949 11.248252 0 22.701019 0.204514 33.949271-0.204513 17.383663-0.613541 31.290593-14.724985 32.108648-32.517676 0.818055-17.179149-11.452766-33.744757-28.427402-34.767325-17.79269-1.227082-35.994408-1.840623-53.582584 0.613541-53.173557 7.567006-88.145396 49.696824-88.34991 103.483922v746.679449c0 58.081885 45.197523 103.279409 102.870381 103.279409h680.826044c14.724985 0 29.245456-2.658678 42.538845-9.203116 40.289195-19.837827 60.331536-52.560016 60.331536-97.348512-0.204514-246.438985-0.204514-493.696026-0.204514-740.953066z m0 0" ></path><path d="M379.066107 204.513681h132.933893c45.811065 0 91.417615 0.409027 137.22868-0.204514 38.244058-0.409027 66.875974-30.268025 67.080487-68.512083 0.204514-21.882964 0-43.765928 0-65.648891 0-40.493709-29.44997-69.943679-70.148192-69.943679H377.429998c-41.10725 0-70.148193 29.040943-70.352706 70.352706v62.172159c0.204514 43.152387 28.836429 71.579788 71.988815 71.784302z m-3.067705-135.797084h272.003196V135.797084h-272.003196V68.716597z m0 0" ></path><path d="M309.940483 545.437987c-2.658678 0-5.112842 0.204514-7.77152 0.613541-14.111444 2.24965-23.723587 10.430198-27.609346 24.132614-3.88576 13.702417-0.409027 25.56421 10.430197 35.176353 7.362493 6.748951 16.565608 8.385061 26.177751 8.385061H710.37827c4.294787 0 8.589575-0.204514 12.679849-0.818055 14.520471-2.454164 26.177751-15.54304 27.200319-30.268024 1.431596-21.473936-13.90693-37.016976-36.812462-37.016977-134.570002-0.204514-268.93549-0.204514-403.505493-0.204513z m0 0M307.690833 784.105452h332.130218c25.768724 0 51.332934 0.204514 77.101657 0 18.815259-0.204514 33.33573-15.134012 33.33573-33.949271 0-19.837827-15.134012-33.949271-36.403435-33.949271H308.304374c-11.248252 0-20.860395 3.88576-27.813861 12.884362-8.589575 11.043739-10.02117 23.31456-4.090273 35.789894 6.339924 12.679848 16.974636 19.224286 31.290593 19.224286z m0 0M307.895347 443.181146c60.331536 0.204514 120.663072 0 180.994607 0h90.395047c16.565608 0 30.063511-10.634711 33.744757-25.973237 5.112842-21.882964-10.634711-41.925305-33.540243-42.129818-45.197523-0.204514-90.395047 0-135.592571 0h-135.59257c-15.54304 0-27.813861 8.589575-32.926703 22.087477-8.589575 22.701019 7.976034 45.811065 32.517676 46.015578z m0 0" ></path></symbol><symbol id="icon-icon-" viewBox="0 0 1024 1024"><path d="M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-960C265.6 64 64 265.6 64 512s201.6 448 448 448 448-201.6 448-448S758.4 64 512 64z" ></path><path d="M512 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M768 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M256 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path></symbol><symbol id="icon-youhuiquan" viewBox="0 0 1024 1024"><path d="M508 479.9c-5.4 0-10.7-2-14.8-6.2L391.4 371.9c-8.2-8.2-8.2-21.5 0-29.7s21.5-8.2 29.7 0L522.9 444c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M508.7 479.9c-5.4 0-10.7-2-14.8-6.2-8.2-8.2-8.2-21.5 0-29.7l101.8-101.8c8.2-8.2 21.5-8.2 29.7 0s8.2 21.5 0 29.7L523.6 473.7c-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M624 514.7H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21zM624 627.2H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21z" fill="" ></path><path d="M514.6 687.9c-11.6 0-21-9.4-21-21V487.4c0-11.6 9.4-21 21-21s21 9.4 21 21v179.5c0 11.6-9.4 21-21 21z" fill="" ></path><path d="M883.8 877H140.2C99.3 877 66 843.7 66 802.8V677.9c0-10 7-18.6 16.8-20.6 68.6-14 118.5-75.1 118.5-145.3S151.4 380.7 82.8 366.7c-9.8-2-16.8-10.6-16.8-20.6V221.2c0-40.9 33.3-74.2 74.2-74.2h743.5c40.9 0 74.2 33.3 74.2 74.2v124.9c0 10-7 18.6-16.8 20.6-68.6 14-118.5 75.1-118.5 145.3s49.8 131.3 118.5 145.3c9.8 2 16.8 10.6 16.8 20.6v124.9c0.1 40.9-33.2 74.2-74.1 74.2zM108 694.2v108.6c0 17.8 14.5 32.2 32.2 32.2h743.5c17.8 0 32.2-14.5 32.2-32.2V694.2c-35.7-10.8-67.8-32.1-91.8-61.1-28-34-43.5-77-43.5-121.1s15.4-87.1 43.5-121.1c24-29 56.1-50.3 91.8-61.1V221.2c0-17.8-14.5-32.2-32.2-32.2H140.2c-17.8 0-32.2 14.5-32.2 32.2v108.6c35.7 10.8 67.8 32.1 91.8 61.1 28 34 43.5 77 43.5 121.1s-15.4 87.1-43.5 121.1c-24 29-56.1 50.3-91.8 61.1z" fill="" ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1089 1024"><path d="M535.744 455.936h-535.68v114.112h535.68V455.936z m489.28 389.952H1.28V960h1023.744v-114.112z m-260.096-145.472V320l260.096 190.208-260.096 190.208zM1025.024 64H2.624v116.096h1022.4V64z" fill="#979797" ></path></symbol><symbol id="icon-shouqi" viewBox="0 0 1088 1024"><path d="M489.536 455.936h535.68v114.112H489.6V455.936zM0.256 845.888H1024V960H0.256v-114.112z m260.096-145.472V320L0.256 510.208l260.096 190.208zM0.256 64h1022.4v116.096H0.256V64z" fill="#979797" ></path></symbol><symbol id="icon-shangpin" viewBox="0 0 1024 1024"><path d="M891.303669 0h-759.406713C59.153786 0 0 59.153786 0 131.896956v760.206088c0 72.743169 59.153786 131.896956 131.896956 131.896956h760.206088c72.743169 0 131.896956-59.153786 131.896956-131.896956V131.896956C1023.200625 59.153786 964.046838 0 891.303669 0zM73.542545 248.605777c18.385636 9.592506 38.370023 14.388759 58.354411 14.388759h760.206088c19.984387 0 39.968774-4.796253 58.354411-14.388759v642.697892c0 31.97502-26.379391 58.354411-58.354411 58.354411H131.896956c-31.97502 0-58.354411-26.379391-58.354411-58.354411V248.605777z 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.35441z" ></path><path d="M224.624512 528.387198c19.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 629.108509 617.117877 707.447307 511.600312 707.447307s-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" ></path></symbol><symbol id="icon-lipin" viewBox="0 0 1024 1024"><path d="M867.54211 277.80819h-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 198.11515 389.398196 136.815015 315.83476 118.42518c-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.558319v125.059274c0 30.652114 24.520463 61.299111 55.168484 67.430762V872.39207c0 42.909276 30.652114 73.561389 73.563436 73.56139h300.371068v0.005116h300.377208c42.911322 0 73.558319-30.652114 73.55832-73.562413V580.64645c0-12.259208-0.402159-36.783765-0.40216-36.783765h6.533811c24.520463-6.131651 49.04195-36.779671 49.041949-67.430762V351.36651c0.001023-42.910299-30.652114-73.558319-73.562413-73.55832zM247.995699 171.141822c20.23281-15.017018 38.60832-9.81146 61.918211-3.979638C359.030561 184.312796 393.106658 217.341027 438.500521 257.885442l22.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 454.598662v-91.212398c0-17.655102 17.649985-35.305087 35.305087-35.305087h313.856197v161.823596H172.273087c-23.539112 0-35.305087-17.649985-35.305087-35.306111zM486.92337 894.467855H220.53937c-22.733771 0-34.099632-11.368932-34.099632-34.102703V577.957201c0-17.052374 17.052374-34.104749 34.104749-34.104749H486.92337v350.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.4752v-350.615403h261.4752c17.056468 0 34.102702 17.056468 34.102703 34.104749v282.407951z m47.049572-405.030733c0 17.897625-17.897625 35.800367-35.795251 35.800368H540.282648V326.85014h308.529889c17.892509 0 35.795251 17.902742 35.795251 35.802414v92.681865z" ></path></symbol><symbol id="icon-icon_yunxiazai" viewBox="0 0 1024 1024"><path d="M790.528 409.6c-18.432-141.824-136.704-252.416-278.528-252.416S251.904 267.264 233.472 409.6C117.76 417.28 25.6 517.12 25.6 637.952c0 125.952 99.84 228.864 220.672 228.864h533.504c120.832-2.56 218.112-102.4 218.112-228.864C998.4 517.12 906.24 417.28 790.528 409.6z m-286.208 389.12l-194.56-223.232h131.584V367.616h125.952v207.872h131.584l-194.56 223.232z" fill="" ></path></symbol><symbol id="icon-daifahuo" viewBox="0 0 1024 1024"><path d="M329.318 571.167c15.114 0 27.361-12.268 27.361-27.341V393.851c0-15.114-12.247-27.361-27.361-27.361s-27.341 12.247-27.341 27.361v122.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 681.165c-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 920.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.16z" ></path><path d="M1003.418 144.814c-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.12v93.614l-222.72 117.76c-51.589 22.303-58.88 87.06-59.167 89.825a26.218 26.218 0 0 0-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 0 2.335-1.085l238.305-125.993a27.361 27.361 0 0 0 14.561-24.207V146.842c0-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.724v680.12c0 15.094 12.227 27.341 27.341 27.341s27.402-12.206 27.402-27.3V146.843a33.572 33.572 0 0 0-0.102-2.028z" ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M245.921684 862.315789a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894737H454.709895a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 1 1 0-53.894737h138.13221z m377.263158-377.263157a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894736h-84.237473a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 1 1 0-53.894736h515.395368z m-377.263158-377.263158a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894737H454.709895a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 0 1 0-53.894737h138.13221zM350.315789 188.631579a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z m377.263158 377.263158a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z m-377.263158 377.263158a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z" ></path></symbol><symbol id="icon-xinxixianshi" viewBox="0 0 1024 1024"><path d="M486.4 418.304h68.096V768H486.4V418.304z" fill="" ></path><path d="M512 938.496c239.104 0 426.496-187.904 426.496-426.496S751.104 85.504 512 85.504 85.504 272.896 85.504 512s187.392 426.496 426.496 426.496z m0 85.504C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z" fill="" ></path><path d="M520.704 327.68m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z" fill="" ></path></symbol></svg>',t=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(t&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(a=c,e=n.document,h=!1,i=function(){h||(h=!0,a())},(o=function(){try{e.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}i()})(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,i())});var a,e,h,i,o}(function(){var c,t;(c=document.createElement("div")).innerHTML=a,a=null,(t=c.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",function(c,t){t.firstChild?function(c,t){t.parentNode.insertBefore(c,t)}(c,t.firstChild):t.appendChild(c)}(t,document.body))})}(window);
\ No newline at end of file
dist/static/fonts/iconfont.svg
......@@ -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="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" />
......@@ -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="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" />
......
dist/static/js/app.4da9883abe21a1dee1df.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.b68de82f60ec8fe0bf79.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/vendor.2a66e15144de1c0f565b.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/vendor.bf93010d9b9b1322a27b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -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/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/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/export-excel.2.0.04.js"></script>
......
src/components/editCouponInfo.vue
......@@ -8,7 +8,7 @@
<el-input-number v-model="editInfoModal.num" style="width:330px" :precision="2" :min="0"> </el-input-number>
</el-form-item>
<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>
<div slot="footer" class="dialog-footer">
......
src/components/getSkuList.vue
......@@ -136,7 +136,7 @@ export default {
this.$message.error('请输入大于0的数字');
this.virtualStock = '';
} else if (!Number(this.virtualStock)) {
this.$message.error('请输入数字类型1');
this.$message.error('请输入数字类型');
this.virtualStock = '';
} else if (Number(this.virtualStock) > 1000000) {
this.$message.error('库存最大1000000');
......@@ -152,6 +152,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......@@ -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) {
for (let item of skuJson) {
if (this.intergralModal.type === 'cash') {
......@@ -295,6 +291,17 @@ export default {
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 => {
if (res.data.errorCode === 0) {
......
src/components/tinymce-edit.vue
......@@ -106,6 +106,10 @@ export default {
methods: {
// 上传图片
handleImgUpload(blobInfo, success, failure) {
if (blobInfo.blob().size > 5 * 1024 * 1024) {
failure('请上传小于 5 M 文件');
return false;
}
var that = this;
let formdata = new FormData();
formdata.set('upload_file', blobInfo.blob());
......
src/router/index.js
......@@ -9,7 +9,9 @@ import couponInfo from '../views/goods/coupon/info';
import giftExchange from '../views/order/giftExchange';
import couponExchange from '../views/order/couponExchange';
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);
const router = new Router({
......@@ -45,6 +47,11 @@ const router = new Router({
component: giftExchange
},
{
path: '/orderDetail',
name: 'orderDetail',
component: orderDetail
},
{
path: '/couponExchange',
name: 'couponExchange',
component: couponExchange
......@@ -53,6 +60,16 @@ const router = new Router({
path: '/refundList',
name: 'refundList',
component: refundList
},
{
path: '/deliverSet',
name: 'deliverSet',
component: deliverSet
},
{
path: '/editDeliver',
name: 'editDeliver',
component: editDeliver
}
]
}
......
src/service/request.js
......@@ -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://gicdev.demogic.com';
let request;
request = axios.create({
baseURL: adminUrl,
withCredentials: true, //跨域凭证
timeout: 30000,
headers: {
// 'Content-Type': 'application/x-www-form-urlencoded'
sign:''
},
});
......@@ -29,6 +31,12 @@ request.interceptors.request.use(
if (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;
},
err => {
......@@ -42,7 +50,9 @@ request.interceptors.response.use(
if (response.status == 200 && response.data.errorCode === 401) {
window.location.href = window.location.origin + '/gic-web';
// window.location.href = 'http://gicdev.com/gic-web'
}
return response;
},
error => {
......
src/views/goods/coupon/coupon.vue
......@@ -41,9 +41,18 @@
<el-table-column label="礼品信息" min-width="310px">
<template slot-scope="scope">
<div class="gift-info">
<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.cardType === 1" src="../../../../static/img/quan03.png" alt="" />
<!-- <p v-if="scope.row.cardType === 2" style="display:inline-block">
<img v-if="scope.row.mainImageUrl" :src="scope.row.mainImageUrl" 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">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
......@@ -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" @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>
<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, 0)">确定</el-button>
......@@ -161,10 +170,22 @@ export default {
mallProId: '',
type: '',
costValue: ''
}
},
couponListObj: {}
};
},
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();
},
methods: {
......@@ -340,6 +361,16 @@ export default {
},
// 编辑
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 } });
},
handleTable(item, type) {
......
src/views/goods/coupon/info.vue
......@@ -17,12 +17,15 @@
<el-form :model="couponForm" :rules="couponRules" ref="couponForm" label-width="100px" class="demo-ruleForm" label-position="right">
<div class="section-content">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
<el-form-item label="选择卡券" required v-show="mallProId === '-1'">
<el-button plain @click="showCard">添加卡券</el-button>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">支持选择兑换券</span>
</el-form-item>
<div class="alert-content" v-if="couponStatus">
<el-alert title="原卡券已被删除，请及时下线卡券，否则用户将无法兑换" type="warning"> </el-alert>
</div>
<el-form-item label="选择卡券" required v-show="mallProId !== '-1'"> </el-form-item>
<el-table :data="cardList" style="width: 900px;margin-left:135px;margin-top:-44px;" v-show="cardList.length > 0">
<el-table :data="cardList" style="width: 900px;margin-left:135px;margin-bottom:22px;display:inline-block" v-show="cardList.length > 0" :style="{ marginTop: mallProId !== '-1' ? '-60px' : '' }">
<el-table-column label="卡券名称" prop="cardName"> </el-table-column>
<el-table-column label="有效期" prop="limitDay">
<template slot-scope="scope">
......@@ -42,6 +45,36 @@
</el-table-column>
<el-table-column label="库存" prop="couponStock"> </el-table-column>
</el-table>
<el-form-item label="卡券主图">
<span style="font-size: 12px;color: rgb(144, 147, 153);">小程序积分商城请升级至V3.0.5及以上版本方可支持</span>
<div class="upload-list-box">
<div style="display: inline-block;vertical-align: top;margin-right:5px">
<div v-for="(item, index) in couponForm.images" :key="index" class="img-box">
<img width="100%" :src="item.imageUrl" alt="" />
<i class="el-icon-arrow-left" @click="moveLeft(index)" v-show="index !== 0"></i>
<i class="el-icon-arrow-right" @click="moveRight(index)" v-show="index + 1 !== couponForm.images.length"></i>
<i class="el-icon-delete" @click="deteletDialogImageUrl(index)"></i>
<i class="el-icon-zoom-in" @click="enlargeDialogImageUrl(index)"></i>
<div class="dialog-img"></div>
</div>
<el-upload :action="uploadAction" :headers="headersUpload" list-type="picture-card" :on-preview="handlePictureCardPreview" :before-upload="beforeUpload" :on-success="uploadSuccess" with-credentials :show-file-list="false" v-show="uploadStatus" style="display: inline-block;vertical-align: top;">
<i class="el-icon-plus"></i>
</el-upload>
</div>
<p style="font-size: 12px; color: rgb(144, 147, 153);line-height:18px;margin-top:10px">图片宽度≥700px，图片宽高比1:1，单张图片大小不超过 2 MB。</p>
<el-dialog :visible.sync="dialogVisibleImg">
<img width="100%" :src="dialogEnlargeImageUrl" alt="" />
</el-dialog>
</div>
</el-form-item>
</div>
<div class="section-content">
<h3>图文信息</h3>
<el-form-item label="">
<div class="tinymce-wrap">
<tinymce-edit ref="tinymceWrap" :bodyHtml="couponForm.detailDescription" :projectName="projectName"></tinymce-edit>
</div>
</el-form-item>
</div>
<div class="section-content">
<h3>销售信息</h3>
......@@ -55,7 +88,7 @@
<el-input-number class="w-350" :precision="2" :min="0" v-model="costValue" :disabled="costValueStatus"></el-input-number>
</el-form-item>
<el-form-item label="库存" prop="virtualStock">
<el-input-number class="w-350" :precision="0" :min="0" v-model="couponForm.virtualStock"></el-input-number>
<el-input-number class="w-350" :precision="0" :min="1" v-model="couponForm.virtualStock"></el-input-number>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;" v-show="cardList.length"
>兑换限制不得大于此优惠券的库存：<i>{{ couponCardStock }}</i
>张</span
......@@ -155,7 +188,7 @@
import qs from 'qs';
import request from '../../../service/request.js';
import getInputVal from '../../../utils/common.js';
import tinymceEdit from '../../../components/tinymce-edit';
export default {
data() {
const validateTime = (rule, value, callback) => {
......@@ -184,6 +217,8 @@ export default {
proReferId: '', //卡券关联id
couponForm: {
cardType: '', //卡券类型
images: [],
detailDescription: '', //图文详情
integralCost: '', //积分费用
cashCost: '',
virtualStock: '',
......@@ -202,6 +237,13 @@ export default {
limitTimeBegin: '',
timeZones: ['', '']
},
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
headersUpload: {
sign: ''
},
uploadStatus: true, //上传按钮
dialogVisibleImg: false, //上传图片
refash: false,
memberGradeList: [], //会员等级
// 门店控件
......@@ -227,10 +269,16 @@ export default {
coupCardId: '', //卡券id
costValue: '', //礼品成本
costValueStatus: true,
couponCardStock: '' //优惠券库存
couponCardStock: '', //优惠券库存
couponStatus: false //卡券状态
};
},
created() {
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
// storage.clear('couponListObj');
localStorage.removeItem('giftListObj');
};
let val = {
storeType: 0,
storeGroupIds: '',
......@@ -283,14 +331,27 @@ export default {
this.couponForm.cashCost = res.data.result.cashCost;
//库存
this.couponForm.virtualStock = res.data.result.virtualStock;
this.couponForm.detailDescription = res.data.result.detailDescription; //图文详情
//适用会员
if (res.data.result.memberGrade) {
this.couponForm.memberGrade = res.data.result.memberGrade.split(',');
} else {
this.couponForm.memberGrade = [];
}
if (res.data.result.images) {
//主图
for (let item of res.data.result.images) {
this.couponForm.images.push({
imageUrl: item.imageUrl,
imageCode: item.imageFieldCode
});
}
}
if (this.couponForm.images.length >= 1) {
this.uploadStatus = false;
} else {
this.uploadStatus = true;
}
this.sendChildData.storeType = res.data.result.showStore || 0;
if (this.sendChildData.storeType === 1) {
this.sendChildData.storeGroupIds = res.data.result.storeGroupIds || '';
......@@ -369,11 +430,17 @@ export default {
if (res.data.errorCode === 0) {
this.cardList.push(res.data.result);
if (this.cardList) {
this.couponForm.cardType = this.cardList[0].cardType;
for (let item of this.cardList) {
item.beginDate = this.getTimeAll(item.beginDate);
item.endDate = this.getTimeAll(item.endDate);
}
}
if (res.data.result.status === 0) {
this.couponStatus = true;
} else {
this.couponStatus = false;
}
this.limitTimes = Number(res.data.result.cardLimit);
this.limitTimesNum = res.data.result.cardLimit;
this.couponCardStock = res.data.result.couponStock;
......@@ -450,8 +517,97 @@ export default {
delTimeRange(index) {
this.couponForm.timeRangeList.splice(index, 1);
},
// 图片上传
// 上传图片前
beforeUpload(file) {
if (this.couponForm.images === null) {
this.couponForm.images = [];
}
if (this.couponForm.images.length > 4) {
this.$message.warning('最多上传5张商品主图');
return false;
}
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的图片');
return false;
}
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
}
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
this.headersUpload.sign = '';
}
var that = this;
return new Promise(function(resolve, reject) {
let reader = new FileReader();
reader.onload = function(event) {
let image = new Image();
image.onload = function() {
let width = this.width;
let height = this.height;
if (width < 700 || width / height != 1) {
that.$message.error('请上传正确的图片尺寸');
reject();
}
resolve();
};
image.src = event.target.result;
};
reader.readAsDataURL(file);
});
},
// 预览
handlePictureCardPreview(file) {
this.couponForm.images = file.url;
this.dialogVisibleImg = true;
},
// 上传图片成功
uploadSuccess(response, file, fileList) {
if (response.errorCode === 0) {
this.couponForm.images.push({
imageUrl: response.result[0].qcloudImageUrl,
imageCode: response.result[0].imageFiledCode
});
this.$message.success('上传成功');
if (this.couponForm.images.length === 1) {
this.uploadStatus = false;
} else {
this.uploadStatus = true;
}
} else {
this.$message.error(response.message);
}
},
// 删除
deteletDialogImageUrl(index) {
this.uploadStatus = true;
this.couponForm.images.splice(index, 1);
},
// 放大
enlargeDialogImageUrl(index) {
this.dialogEnlargeImageUrl = this.couponForm.images[index].imageUrl;
this.dialogVisibleImg = true;
},
// 左移一位
moveLeft(index) {
this.swapArray(this.couponForm.images, index, index - 1);
},
//右移一位
moveRight(index) {
this.swapArray(this.couponForm.images, index, index + 1);
},
//两个数据条换位置
swapArray(arr, index1, index2) {
arr[index1] = arr.splice(index2, 1, arr[index1])[0];
return arr;
},
// 提交数据
submitForm(couponForm) {
this.couponForm.detailDescription = this.$refs.tinymceWrap.tinymceHtml;
if (this.cardList.length === 0) {
this.$message.error('请选择卡券');
return false;
......@@ -480,6 +636,27 @@ export default {
return false;
}
}
//图文详情的大小限制
if (this.couponForm.detailDescription) {
if (this.couponForm.detailDescription.length > 5000) {
this.$message.error('图文详情输入内容不能超过5000');
return false;
}
}
if (this.couponForm.cardType === 2) {
//兑换券必须上传主图
if (this.couponForm.images.length === 0) {
this.$message.error('兑换券要上传商品主图');
return false;
}
}
let giftImageUrls = [];
let giftImageFiledCodes = [];
for (let item of this.couponForm.images) {
giftImageUrls.push(item.imageUrl);
giftImageFiledCodes.push(item.imageCode);
}
this.$refs[couponForm].validate(valid => {
if (valid) {
let params = {
......@@ -487,6 +664,9 @@ export default {
integralMallProId: this.mallProId === '-1' ? '' : this.mallProId, //礼品id
proType: 1, //优惠券
proReferId: this.proReferId, //卡券id
detailDescription: this.couponForm.detailDescription, //图文详情
giftImageUrls: giftImageUrls.join(','), //礼品主图
giftImageFiledCodes: giftImageFiledCodes.join(','),
cardType: this.couponForm.cardType,
integralCost: this.couponForm.integralCost, //积分费用
costValue: this.costValue, //礼品成本
......@@ -555,7 +735,9 @@ export default {
});
}
},
components: {}
components: {
tinymceEdit
}
};
</script>
<style scoped>
......@@ -603,6 +785,105 @@ export default {
.mb8 {
margin-bottom: 8px;
}
/* 主图 */
.img-box {
width: 104px;
height: 104px;
border-radius: 4px;
display: inline-block;
margin-right: 8px;
position: relative;
}
.img-box img {
border-radius: 4px;
}
.dialog-img {
width: 104px;
height: 104px;
position: absolute;
left: 0;
top: 0;
background: rgba(0, 0, 0, 0.5);
display: none;
cursor: pointer;
border-radius: 6px;
}
.img-box:hover .dialog-img {
display: block;
}
.upload-list-box .el-icon-delete {
position: absolute;
left: 56px;
top: 50%;
transform: translateY(-50%);
display: none;
font-size: 20px;
color: #fff;
z-index: 2;
}
.el-icon-zoom-in {
position: absolute;
left: 30px;
top: 50%;
transform: translateY(-50%);
display: none;
font-size: 20px;
color: #fff;
z-index: 2;
}
.el-icon-arrow-left {
position: absolute;
left: 5px;
top: 50%;
transform: translateY(-50%);
display: none;
font-size: 20px;
color: #fff;
z-index: 2;
}
.el-icon-arrow-right {
position: absolute;
right: 5px;
top: 50%;
transform: translateY(-50%);
display: none;
font-size: 20px;
color: #fff;
z-index: 2;
}
.img-box:hover i {
display: block;
cursor: pointer;
}
.img-box:first-child .el-icon-arrow-left {
display: none;
}
.img-box:last-child .el-icon-arrow-right {
display: none;
}
/*.img-box:hover img{
opacity:0.6;
cursor: pointer;
}*/
.img-box img {
width: 104px;
height: 104px;
}
.w-300 {
width: 300px;
}
.w-600 {
width: 600px;
}
.mall-content-section {
position: relative;
}
.alert-content {
width: 500px;
margin: 22px 0 22px 133px;
}
</style>
<style>
.select-shop__right {
......@@ -611,4 +892,9 @@ export default {
.section-content .pagination {
float: none !important;
}
.upload-list-box .el-upload--picture-card {
width: 104px;
height: 104px;
line-height: 104px;
}
</style>
src/views/goods/gift/addSku.vue
......@@ -44,7 +44,7 @@
</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>
<span class="tip-warm ml20">如有颜色、尺码等多种规格，请添加规格</span>
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">公众号积分商城不支持此功能，小程序积分商城请升级至V3.0.0及以上版本</span>
......@@ -116,6 +116,9 @@ export default {
},
isStdImg: {
type: Boolean
},
giftType: {
type: Number
}
},
data() {
......@@ -569,6 +572,8 @@ export default {
if (Number(item2.valueName < 0)) {
this.$message.error('请输入大于0的数字');
item2.valueName = '';
} else if (Number(item2.valueName) === 0) {
return false;
} else if (!Number(item2.valueName)) {
this.$message.error('请输入数字类型');
item2.valueName = '';
......
src/views/goods/gift/couponList.vue 0 → 100644
<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>
src/views/goods/gift/gift.vue
......@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column prop="sortCost" label="库存" sortable="custom">
<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>
</el-table-column>
<el-table-column prop="sortTimes" label="销量" sortable="custom">
......@@ -95,15 +95,16 @@
<span style="display:none">{{ refash }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="180px">
<el-table-column label="操作" min-width="220px">
<template slot-scope="scope">
<div>
<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 === 1" @click="deleteList(scope.row, 2)">上架</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">
<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">
<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>
......@@ -137,6 +138,8 @@
<selectType :addModalData="addModalData"></selectType>
<!-- 调整积分费用 -->
<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>
</template>
......@@ -149,6 +152,7 @@ import eqCode from '../../../components/eqCode';
import selectType from '../../../components/selectGoodsType';
import stockModal from '../../../components/getSkuList';
import copy from '../../../utils/clone.js';
import couponList from './couponList';
export default {
data() {
return {
......@@ -198,10 +202,31 @@ export default {
list: [],
type: ''
},
list: []
list: [],
giftListObj: {}, //缓存数据
couponListModal: {
dialogVisible: false,
integralMallProId: '',
tableDate: []
},
couponListSearch: '',
couponCurrentPage: 1,
couponPageSize: 20
};
},
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();
},
methods: {
......@@ -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) {
let params = {
......@@ -393,6 +459,17 @@ export default {
},
// 编辑
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 } });
},
//编辑序号
......@@ -545,7 +622,8 @@ export default {
editName,
eqCode,
selectType,
stockModal
stockModal,
couponList
}
};
</script>
......@@ -571,7 +649,7 @@ export default {
.info-name {
display: inline-block;
vertical-align: top;
width: 70%;
width: 71%;
}
.pro-ellipsis {
color: #303133;
......
src/views/goods/gift/importCoupon.vue 0 → 100644
<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>
src/views/goods/gift/info.vue
......@@ -14,7 +14,7 @@
</h3>
</div>
<div class="section">
<el-form :model="giftForm" :rules="giftRules" ref="giftForm" label-width="140px" class="demo-ruleForm" label-position="right">
<el-form :model="giftForm" :rules="giftRules" ref="giftForm" label-width="150px" class="demo-ruleForm" label-position="right">
<div class="section-content">
<h3>基础信息</h3>
<el-form-item label="礼品名称" prop="proName">
......@@ -23,9 +23,8 @@
</el-input>
</el-form-item>
<el-form-item label="礼品主图" required>
<p style="font-size: 12px; color: rgb(144, 147, 153);">图片宽度≥700px，图片宽高比1:1，单张图片大小不超过 2 MB，至少上传1张，最多可上传 5 张。</p>
<div class="upload-list-box">
<div style="display: inline-block;vertical-align: top;margin-right:5px">
<div style="display: inline-block;vertical-align: top;margin-right:5px;height:104px;">
<div v-for="(item, index) in giftForm.images" :key="index" class="img-box">
<img width="100%" :src="item.imageUrl" alt="" />
<i class="el-icon-arrow-left" @click="moveLeft(index)" v-show="index !== 0"></i>
......@@ -34,11 +33,11 @@
<i class="el-icon-zoom-in" @click="enlargeDialogImageUrl(index)"></i>
<div class="dialog-img"></div>
</div>
<el-upload :action="uploadAction" list-type="picture-card" :on-preview="handlePictureCardPreview" :before-upload="beforeUpload" :on-success="uploadSuccess" with-credentials :show-file-list="false" v-show="uploadStatus" style="display: inline-block;vertical-align: top;">
<el-upload :action="uploadAction" :headers="headersUpload" list-type="picture-card" :on-preview="handlePictureCardPreview" :before-upload="beforeUpload" :on-success="uploadSuccess" with-credentials :show-file-list="false" v-show="uploadStatus" style="display: inline-block;vertical-align: top;">
<i class="el-icon-plus"></i>
</el-upload>
</div>
<p style="font-size: 12px; color: rgb(144, 147, 153);line-height:18px;margin-top:10px;">图片宽度≥700px，图片宽高比1:1，单张图片大小不超过 2 MB，至少上传1张，最多可上传 5 张。</p>
<el-dialog :visible.sync="dialogVisibleImg">
<img width="100%" :src="dialogEnlargeImageUrl" alt="" />
</el-dialog>
......@@ -57,8 +56,8 @@
</div>
<div class="section-content">
<h3>销售信息</h3>
<el-form-item label="礼品规格">
<addSku :skuJson="giftProStandardJson" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
<el-form-item label="礼品规格" v-if="giftType === 1 || submitSkuJson.length">
<addSku :skuJson="giftProStandardJson" :giftType="giftType" @getSpuStock="getSpuStock" @getStandradList="getStandradList" @getSkuList="getSkuList" @IsAgreeUpload="IsAgreeUpload" :isStdImg="isStdImg" :skuList="skuList"></addSku>
</el-form-item>
<el-form-item label="礼品编码">
<table class="spu-table">
......@@ -95,6 +94,13 @@
<el-form-item label="礼品成本" prop="costValue">
<el-input-number class="w-350" :precision="2" :min="0" v-model="giftForm.costValue" :disabled="costValueStatus"></el-input-number>
</el-form-item>
<el-form-item label="市场价">
<el-input-number class="w-350" :precision="2" :min="0" :max="9999999" v-model="giftForm.marketPrice"></el-input-number>
<el-popover placement="top-start" width="347" trigger="hover">
<img src="../../../../static/img/eg.png" alt="" />
<el-button slot="reference" type="text" style="margin-left:15px;">查看示例</el-button>
</el-popover>
</el-form-item>
</div>
<div class="section-content">
<h3>图文信息</h3>
......@@ -179,13 +185,49 @@
<el-form-item class="form-item-mt" v-if="giftForm.releaseType === 2" prop="limitTimeBegin">
<el-date-picker v-model="giftForm.limitTimeBegin" type="datetime" placeholder="选择日期时间"> </el-date-picker>
</el-form-item>
<el-form-item label="配送方式" required>
<!-- 实物礼品 -->
<el-form-item label="配送方式" required v-if="giftType === 1" prop="changeTypeList">
<el-checkbox-group v-model="giftForm.changeTypeList" :disabled="editChangeTypeStatus" @change="handleStatus">
<el-checkbox label="2">快递发货</el-checkbox>
<el-checkbox v-if="giftForm.changeType === 1" label="1">微信兑换券</el-checkbox>
<!-- <el-checkbox v-if="giftForm.changeType !== 1" label="4">门店自提</el-checkbox> -->
</el-checkbox-group>
</el-form-item>
<!-- 虚拟礼品 -->
<!-- <el-form-item label="配送方式" required v-else>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3">在线发货 </el-radio>
<el-radio :label="1">微信兑换券</el-radio>
</el-radio-group>
</el-form-item> -->
<el-form-item label="配送方式" required v-if="giftType !== 1">
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3"
>在线发货
<el-tooltip effect="dark" content="上架虚拟商品时，若选择在线发货，则买家下单后，商户需及时在后台点击发货" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
</el-radio>
<el-radio :label="1" v-if="giftForm.changeType === 1">微信兑换券</el-radio>
<el-radio :label="5" v-if="giftForm.changeType !== 1"
>文本券码
<el-tooltip effect="dark" content="上架虚拟商品时，若选择文本券码，则可预先上传券码等信息，买家下单后，系统会自动将券码发给买家并完成交易，无需商户在后台点击发货。" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
</el-radio>
</el-radio-group>
<el-button type="primary" size="mini" v-if="giftForm.changeType === 5" style="margin-left:20px;" @click="handleImportCoupon">批量导入</el-button>
<span v-if="giftForm.changeType === 5" style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">小程序积分商城请升级至V3.0.5及以上版本方可支持</span>
</el-form-item>
<!-- <el-form-item label="配送方式" required>
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="2" v-if="giftType === 1">快递发货</el-radio>
<el-radio :label="3" v-if="giftType === 0">在线发货</el-radio>
<el-radio :label="1">微信兑换券</el-radio>
</el-radio-group>
</el-form-item>
</el-form-item> -->
<div class="section-content1" v-show="giftForm.changeType === 1">
<h3>选择卡券</h3>
<el-form-item label="选择卡券" required v-show="mallProId === '-1'" style="margin-bottom:66px;">
......@@ -215,9 +257,12 @@
</div>
</div>
<div class="section-content">
<div class="section-content section-tip-content">
<h3>售后服务</h3>
<el-form-item label="支持买家申请退款" required>
<el-form-item label="支持买家申请退款 " required>
<el-tooltip class="tip-content" effect="dark" content="若商品不支持买家退款，则在下单时系统会提醒买家此商品不支持退款或退货。" placement="top-start">
<i class="iconfont icon-xinxixianshi"></i>
</el-tooltip>
<el-radio-group v-model="giftForm.refundType" :disabled="refundTypeStatus">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
......@@ -245,6 +290,15 @@
<addCate :addCateModal="addCateModal" @getCategoryOptions="getCategoryOptions"></addCate>
<!-- 卡券选择弹框 -->
<vue-gic-card :disabledList="disabledList" :projectName="projectName" :showCardDialog="showCardDialog" :cardLimit="cardLimit" :cardType="cardType" @selectCard="selectCard" ref="dmcard"></vue-gic-card>
<!-- 跳转链接 -->
<el-dialog title="提示" :visible.sync="dialogVisibleLink" width="400px">
<p style="margin-bottom:22px;">需先开启门店自提服务后方可生效，请先<el-button type="text" @click="goDeliverSet">前往设置</el-button></p>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisibleLink = false">取 消</el-button>
<el-button type="primary" @click="goDeliverSet">确 定</el-button>
</span>
</el-dialog>
<importCoupon :importCouponModal="importCouponModal" @getSuceessNum="getSuceessNum"></importCoupon>
</div>
</template>
......@@ -255,6 +309,7 @@ import copy from '../../../utils/clone.js';
import getInputVal from '../../../utils/common.js';
import addCate from '../../../components/addGiftCate';
import tinymceEdit from '../../../components/tinymce-edit';
import importCoupon from './importCoupon';
import addSku from './addSku';
export default {
data() {
......@@ -292,9 +347,11 @@ export default {
proShowStatus: 1, //显示状态
releaseType: 1, //上架时间
limitTimeBegin: '', //上架时间具体
changeType: 1, //配送方式T
changeType: 5, //配送方式T
changeTypeList: [], //配东方式
refundType: 0, //是否允许退款
costValue: '', //礼品成本
marketPrice: '', //市场价
proCode: '', //编码
integralCost: '', //积分
cashCost: '', //现金
......@@ -314,11 +371,15 @@ export default {
exchangeFixDate: [{ required: true, message: '请选择时间', trigger: 'change' }],
exchangeDateDayArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }]
limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }],
changeTypeList: [{ type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change' }]
},
refundTypeStatus: false,
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
// uploadAction: 'http://gicdev.demogic.com/api-plug/upload-img?requestProject=integral-mall',
headersUpload: {
sign: ''
},
proNameLen: 0,
uploadStatus: true, //上传按钮
dialogVisibleImg: false, //上传图片
......@@ -356,11 +417,23 @@ export default {
couponCostValue: 0, //兑换券成本
couponCardStock: 0, //兑换券库存
costValueStatus: false
costValueStatus: false,
dialogVisibleLink: false,
importCouponModal: {
//文本券码导入
dialogVisible: false,
integralMallProId: ''
},
textStock: 0 //文本券码库存数
// proReferId: ''
};
},
created() {
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
// storage.clear('giftListObj');
localStorage.removeItem('giftListObj');
};
this.giftType = Number(this.$route.query.type); //列表上实物是1虚拟是0
this.mallProId = this.$route.query.giftId;
this.giftForm.proReferId = this.$route.query.proReferId;
......@@ -371,13 +444,23 @@ export default {
this.giftForm.changeType = 2;
} else if (this.giftType === 0) {
//虚拟
this.giftForm.changeType = 3;
this.giftForm.changeType = 5;
this.stockDisabled = this.giftForm.changeType === 5 ? true : false;
this.refundTypeStatus = this.giftForm.changeType === 5 ? true : false;
}
if (this.mallProId !== '-1') {
this.getInfo();
this.editChangeTypeStatus = true;
} else {
if (this.giftType === 0) {
this.getGiftId();
} else {
this.mallProId === '-1';
}
}
// if (this.giftForm.changeType === 5) {
// this.refundTypeStatus = true;
// }
let val = {
storeType: 0,
storeGroupIds: '',
......@@ -508,6 +591,7 @@ export default {
this.giftForm.virtualStock = res.data.result.virtualStock; //库存
this.giftForm.proCodeQuery = res.data.result.proCodeQuery; //条形码
this.giftForm.costValue = res.data.result.costValue; //礼品成本
this.giftForm.marketPrice = res.data.result.marketPrice; //市场价
this.giftForm.detailDescription = res.data.result.detailDescription; //图文详情
this.giftForm.memberGrade = res.data.result.memberGrade.split(','); //适用会员
......@@ -520,7 +604,11 @@ export default {
});
}
}
if (this.giftForm.images.length >= 5) {
this.uploadStatus = false;
} else {
this.uploadStatus = true;
}
//限兑
if (res.data.result.limitTimes === -1) {
this.giftForm.limitTimesStatus = false;
......@@ -580,13 +668,22 @@ export default {
} else {
this.giftForm.limitTimeBegin = '';
}
//配送方式
this.giftForm.changeType = res.data.result.changeType;
if (this.giftForm.changeType === 1) {
if (res.data.result.giftType === 1) {
//实物礼品
this.giftForm.changeType = Number(res.data.result.changeType);
this.giftForm.changeTypeList = res.data.result.changeType.split(',');
} else if (res.data.result.giftType === 0) {
//虚拟礼品
this.giftForm.changeType = Number(res.data.result.changeType);
}
if (this.giftForm.changeType === 1 || this.giftForm.changeType === 5) {
this.refundTypeStatus = true;
} else {
this.refundTypeStatus = false;
}
this.giftForm.refundType = res.data.result.refundType;
if (this.giftForm.changeType === 1) {
//微信兑换券
......@@ -649,6 +746,8 @@ export default {
this.skuList.push(tem);
}
}
if (res.data.result.giftType === 1) {
//实物礼品
if (this.giftProStandardJson.length > 0) {
if (this.skuList.length > 0) {
//spu库存是否可输入
......@@ -659,17 +758,27 @@ export default {
} else {
this.stockDisabled = false;
}
//根据sku的库存获得spu的库存
// let temSum = 0;
// for (let i in this.skuList) {
// for (let j in this.skuList[i]) {
// if (this.skuList[i].length - j == 3) {
// if (this.skuList[i][j].valueName !== '') temSum += Number(this.skuList[i][j].valueName);
// }
// }
// }
// this.giftForm.virtualStock = temSum;
} else if (res.data.result.giftType === 0) {
//虚拟
if (this.giftForm.changeType === 5) {
//文本券码
this.stockDisabled = true;
} else {
//在线发货
if (this.giftProStandardJson.length > 0) {
if (this.skuList.length > 0) {
//有sku(主要是处理老数据)
//spu库存是否可输入
this.stockDisabled = true;
} else {
//无sku的数据
this.stockDisabled = false;
}
} else {
this.stockDisabled = false;
}
}
}
} else {
this.$message.error(res.data.message);
}
......@@ -688,7 +797,7 @@ export default {
// spu信息限制
limitProCode(value) {
this.$nextTick(() => {
this.giftForm.proCode = getInputVal.getInputVal(value, 32);
this.giftForm.proCode = getInputVal.getInputVal(value, 16);
});
},
limitProCodeType() {
......@@ -749,7 +858,7 @@ export default {
},
limintProCodeQuery(value) {
this.$nextTick(() => {
this.giftForm.proCodeQuery = getInputVal.getInputVal(value, 32);
this.giftForm.proCodeQuery = getInputVal.getInputVal(value, 16);
});
},
limitproCodeQueryType() {
......@@ -834,6 +943,11 @@ export default {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
}
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
this.headersUpload.sign = '';
}
var that = this;
return new Promise(function(resolve, reject) {
let reader = new FileReader();
......@@ -911,7 +1025,7 @@ export default {
this.giftForm.timeRangeList.splice(index, 1);
},
changeDeliver() {
if (this.giftForm.changeType === 1) {
if (this.giftForm.changeType === 1 || this.giftForm.changeType === 5) {
//微信兑换券
this.refundTypeStatus = true;
this.giftForm.refundType = 0;
......@@ -919,6 +1033,56 @@ export default {
this.refundTypeStatus = false;
this.cardList = [];
}
if (this.giftForm.changeType === 3) {
//在线发货
this.giftForm.virtualStock = 0;
} else if (this.giftForm.changeType === 5) {
//文本卡券
this.giftForm.virtualStock = this.textStock;
}
this.stockDisabled = this.giftForm.changeType === 5 ? true : false;
},
//获取商品的id
getGiftId() {
request.post('/api-integral-mall/get-gift-id').then(res => {
if (res.data.errorCode === 0) {
this.mallProId = res.data.result;
} else {
this.$message.error(res.data.message);
}
});
},
// 导入文本券码
handleImportCoupon() {
this.importCouponModal.dialogVisible = true;
this.importCouponModal.integralMallProId = this.mallProId;
},
// 获取文本券码成功的数据
getSuceessNum(val) {
this.textStock = val;
this.giftForm.virtualStock = this.textStock;
},
// 勾选自提点
handleStatus() {
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
//0关闭1开启
this.dialogVisibleLink = true;
for (let i = 0; i < this.giftForm.changeTypeList.length; i++) {
if (this.giftForm.changeTypeList[i] === '4') {
this.giftForm.changeTypeList.splice(i, 1);
}
}
}
} else {
this.$message.error(res.data.message);
}
});
},
// 跳转到设置自提点
goDeliverSet() {
this.$router.push({ name: 'deliverSet' });
},
// 获取规格列表
getStandradList(val) {
......@@ -1040,6 +1204,7 @@ export default {
},
// 保存
submitGoodsForm(form) {
this.giftForm.detailDescription = this.$refs.tinymceWrap.tinymceHtml;
let giftImageUrls = [];
let giftImageFiledCodes = [];
if (this.giftForm.images.length === 0) {
......@@ -1063,7 +1228,7 @@ export default {
}
}
}
if (!item.stock) {
if (!item.stock && item.stock !== 0) {
this.$message.error('请填写库存');
return false;
}
......@@ -1101,7 +1266,7 @@ export default {
} else if (this.giftForm.cashCost === '') {
this.$message.error('请填写礼品现金');
return false;
} else if (this.giftForm.virtualStock === '' || Number(this.giftForm.virtualStock) === 0) {
} else if (this.giftForm.virtualStock === '') {
this.$message.error('请填写礼品库存');
return false;
}
......@@ -1141,6 +1306,13 @@ export default {
// return false;
// }
// }
if (this.giftForm.detailDescription) {
if (this.giftForm.detailDescription.length > 5000) {
this.$message.error('图文详情输入内容不能超过5000');
return false;
}
}
this.$refs[form].validate(valid => {
if (valid) {
let params = {
......@@ -1153,7 +1325,7 @@ export default {
proReferId: this.giftForm.changeType === 1 ? this.giftForm.proReferId : '', //关联id
cardType: this.giftForm.changeType === 1 ? this.giftForm.cardType : '', //卡券类型
proCategoryId: this.giftForm.proCategoryId, //礼品分类
detailDescription: this.$refs.tinymceWrap.tinymceHtml, //图文详情
detailDescription: this.giftForm.detailDescription, //图文详情
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
......@@ -1169,13 +1341,14 @@ export default {
proCode: this.giftForm.proCode, //编码
proCodeQuery: this.giftForm.proCodeQuery, //条形码
costValue: this.giftForm.changeType === 1 ? this.couponCostValue : this.giftForm.costValue, //卡券礼品成本
marketPrice: this.giftForm.marketPrice, //市场价
// cashCost: this.giftForm.costValue, //礼品成本
virtualStock: this.giftForm.virtualStock, //库存
timeZones: '', //部分时段
proShowStatus: this.giftForm.proShowStatus, //显示状态
releaseType: this.giftForm.releaseType, //上架状态
limitTimeBegin: this.giftForm.releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin) : '', //定时上架时间
changeType: this.giftForm.changeType, //配送方式
changeType: this.giftType === 0 ? String(this.giftForm.changeType) : this.giftForm.changeTypeList.join(','), //配送方式
// proReferId: this.giftForm.changeType === 1 ? this.proReferId : '', //微信兑换券
refundType: this.giftForm.refundType, //售后
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
......@@ -1234,7 +1407,8 @@ export default {
components: {
addCate,
tinymceEdit,
addSku
addSku,
importCoupon
}
};
</script>
......@@ -1453,6 +1627,10 @@ export default {
padding: 20px 15px;
vertical-align: middle;
}
.tip-content {
position: absolute;
left: -25px;
}
</style>
<style>
.upload-list-box .el-upload--picture-card {
......@@ -1463,4 +1641,7 @@ export default {
.select-shop__right {
line-height: 28px !important;
}
.section-tip-content .el-form-item__label {
text-align: left !important;
}
</style>
src/views/order/closeOrder.vue
......@@ -60,10 +60,10 @@ export default {
this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
this.$message.success('关闭订单成功1');
this.refunOrderdModal.dialogVisible = false;
this.submitLoading = false;
this.$emit('getList');
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
......
src/views/order/couponExchange.vue
......@@ -3,6 +3,7 @@
<div class="mall-content-section">
<div class="mall-content-title" style="border:none">
<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>
......@@ -26,12 +27,12 @@
</el-select>
</div> -->
<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 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 plain @click="exportExcelAll" v-else><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 @click="exportExcelAll" v-else type="primary"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出订单</el-button>
</div>
</div>
</div>
......@@ -51,13 +52,17 @@
<!-- 折扣券 -->
<!-- <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.cardType === 1" src="../../../static/img/quan03.png" alt="" />
<!-- 兑换券 -->
<img v-if="scope.row.giftMainPic" :src="scope.row.giftMainPic" 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">
<p class="pro-ellipsis">{{ scope.row.giftName }}</p>
<!-- 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>
<!-- status： <= 1是未领取，2是已领取 -->
<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">
<span v-for="(i, v) in scope.row.sku" :key="v" style="margin-right:3px">{{ i.proName }}:{{ v.valueName ? v.valueName : '--' }}</span>
</p>
......@@ -72,7 +77,7 @@
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="definedCode" label="订单编号">
<el-table-column prop="definedCode" label="订单编号" width="200px">
<template slot-scope="scope">
<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>
......
src/views/order/delive.vue
......@@ -135,6 +135,7 @@ export default {
deliveryContent: this.deliverdModal.changeType === 3 ? this.deliverdModal.content : '' //在线发货内容
};
if (this.deliverdModal.changeType === 3) {
//在线发货
params.logisticsCompanyId = '';
params.logisticsCompanyCode = '';
params.logisticsCompanyName = '';
......
src/views/order/deliverInfo.vue
......@@ -47,7 +47,7 @@
</div>
<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="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>
</div>
</div>
......@@ -166,6 +166,7 @@ export default {
courierNumber: this.temDeliverInfodModal.courierNumber,
logisticsCompanyName: this.otherLogistics ? this.temDeliverInfodModal.otherLogisticsCompanyName : this.logisticsCompanyName //物流公司名称
};
return false
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货成功');
......
src/views/order/errorList.vue
<template>
<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">
<span class="reason-info">{{ item.orderNumber }}</span>
<span class="sku-info">{{ item.errorMessage }}</span>
......@@ -27,7 +27,9 @@ export default {
.sku-info {
font-size: 13px;
color: #606266;
margin: 15px 0 5px 15px;
margin-left: 10px;
vertical-align: top;
width: 280px;
display: inline-block;
word-break: break-all;
}
......@@ -35,6 +37,9 @@ export default {
color: #303133;
font-size: 14px;
font-weight: 500;
word-break: break-all;
width: 80px;
display: inline-block;
}
.list-content {
margin-bottom: 15px;
......
src/views/order/giftExchange.vue
......@@ -3,6 +3,7 @@
<div class="mall-content-section">
<div class="mall-content-title" style="border:none">
<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>
......@@ -23,10 +24,12 @@
<el-select v-model="changeType" placeholder="配送方式" clearable @change="getListCurr" style="width:160px;">
<el-option label="物流发货" :value="2"></el-option>
<el-option label="在线发货（虚拟商品）" :value="3"></el-option>
<!-- <el-option label="门店自提" :value="4"></el-option> -->
<el-option label="文本券码" :value="5"></el-option>
</el-select>
</div>
<div class="search-item">
<el-input style="width:260px;" v-model="searchValue" placeholder="请输入礼品名称/编码进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
<el-input style="width:260px;" v-model="searchValue" placeholder="请输入会员/商品/订单进行搜索" prefix-icon="el-icon-search" clearable @keyup.enter.native="handleInputSearch(searchValue)" @clear="handleInputSearch(searchValue)"> </el-input>
</div>
</div>
<div class="fr">
......@@ -64,10 +67,13 @@
<p style="line-height:18px" class="gray-color">{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}</p>
</template>
</el-table-column>
<el-table-column prop="definedCode" label="订单编号">
<el-table-column prop="definedCode" label="订单编号" width="200px">
<template slot-scope="scope">
<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">
<span class="go-link" @click="goDetail(scope.row)">{{ scope.row.definedCode }}</span
><i class="iconfont icon-icon-"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">订单编号：{{ orderInfo.orderNumber }}</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">商户支付号：{{ orderInfo.merchantNumber }}</el-dropdown-item>
......@@ -100,13 +106,15 @@
<span v-if="scope.row.status <= 0">交易关闭</span>
</p>
<p style="line-height:18px">
<!-- <el-button type="text" @click="goDetail(scope.row)">订单详情</el-button> -->
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 2" @click="handleDeliver(scope.row)">物流发货</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 3" @click="handleDeliver(scope.row)">在线发货</el-button>
<el-button type="text" v-if="scope.row.status === 3" @click="getDeliverInfo(scope.row)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.changeType === 4" @click="deliverShop(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.status === 3 && scope.row.changeType !== 5" @click="getDeliverInfo(scope.row)">查看物流</el-button>
<el-button type="text" v-if="scope.row.status === 1 && scope.row.refundStatus !== 2" @click="closeOrder(scope.row)">关闭订单</el-button>
<!-- 待付款关闭订单 -->
<el-button type="text" v-if="scope.row.status === 11 && scope.row.refundStatus !== 2" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status === 11" @click="closeOrderNoPay(scope.row)">关闭订单</el-button>
<el-button type="text" v-if="scope.row.status <= 0" @click="getCloseInfo(scope.row)">查看详情</el-button>
</p>
</template>
......@@ -130,7 +138,7 @@
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</el-tabs>
......@@ -206,6 +214,17 @@
<el-button @click="cancelSubmit('deliverInfodModal')">关闭</el-button>
</div>
</el-dialog>
<!-- 门店自提核销 -->
<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>
<!-- 批量发货 -->
<importdispatch :deliverModal="deliverModal"></importdispatch>
<!-- 导出订单 -->
......@@ -312,7 +331,12 @@ export default {
placement: 'top-start',
requestProject: 'integral-mall',
testNum: '',
testName: ''
testName: '',
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false, //门店自提确认按钮
giftOrderObj: {} //缓存数据
};
},
watch: {
......@@ -324,12 +348,36 @@ export default {
created() {
this.getNumber();
this.integralMallProId = this.$route.query.integralMallProId;
if (localStorage.getItem('giftOrderObj')) {
this.giftOrderObj = JSON.parse(localStorage.getItem('giftOrderObj'));
this.currentPage = this.giftOrderObj.currentPage;
this.pageSize = this.giftOrderObj.pageSize;
this.total = this.giftOrderObj.total;
this.changeType = this.giftOrderObj.changeType; //配送方式
this.orderStatus = this.giftOrderObj.orderStatus; //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
this.searchValue = this.giftOrderObj.searchValue; //搜索
this.pageType = this.giftOrderObj.pageType; //1、代表优惠券订单列表 2、礼品订单
this.beginTime = this.giftOrderObj.beginTime;
this.endTime = this.giftOrderObj.endTime;
if (this.beginTime) {
this.dateValue[0] = this.beginTime;
this.dateValue[1] = this.endTime;
} else {
this.dateValue = null;
}
this.sortType = this.giftOrderObj.sortType;
this.integralMallProId = this.giftOrderObj.integralMallProId;
localStorage.removeItem('giftOrderObj'); //使用完就清除缓存
}
this.getList();
},
methods: {
// tab切换
handleClick(tab) {
this.orderStatus = tab.name;
this.currentPage = 1;
this.getList();
},
// 搜索
......@@ -383,8 +431,8 @@ export default {
// 时间改变
changeTime() {
if (this.dateValue) {
this.beginTime = this.getTimeAll(this.dateValue[0]);
this.endTime = this.getTimeAll(this.dateValue[1]);
this.beginTime = this.dateValue[0] ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue[1] ? this.getTimeAll(this.dateValue[1]) : '';
} else {
this.beginTime = '';
this.endTime = '';
......@@ -394,6 +442,7 @@ export default {
},
//获取列表
getList() {
// console.log(this.dateValue)
this.beginTime = this.dateValue ? this.getTimeAll(this.dateValue[0]) : '';
this.endTime = this.dateValue ? this.getTimeAll(this.dateValue[1]) : '';
let params = {
......@@ -506,6 +555,7 @@ export default {
this.deliverInfodModal.logisticsCompanyName = res.data.result.changeLog.logisticsCompanyName; //快递公司
this.deliverInfodModal.logisticsCompanyId = res.data.result.changeLog.logisticsCompanyId; //快递公司
this.deliverInfodModal.logisticsCompanyCode = res.data.result.changeLog.logisticsCompanyCode; //快递code
this.logisticsCompanyCode = res.data.result.changeLog.logisticsCompanyCode; //快递code
// this.deliverInfodModal.courierNumber = res.data.result.changeLog.courierNumber; //快递单号
this.testNum = this.deliverInfodModal.courierNumber = res.data.result.changeLog.courierNumber;
......@@ -631,6 +681,7 @@ export default {
courierNumber: this.testNum,
logisticsCompanyName: this.otherLogistics ? this.testName : this.logisticsCompanyName //物流公司名称
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('修改成功');
......@@ -641,6 +692,38 @@ export default {
}
});
},
// 门店自提发货
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;
}
});
},
cancelLogisticsInfo() {
this.editStatus = false;
},
......@@ -651,6 +734,25 @@ export default {
this.editStatus = false;
this.deliverInfodModal.dialogVisible = false;
this.deliverInfodModal.dialogVisible = false;
},
// 进入订单详情
goDetail(item) {
//列表筛选条件存缓存
this.giftOrderObj = {
currentPage: this.currentPage,
pageSize: this.pageSize,
total: this.total,
changeType: this.changeType, //配送方式
orderStatus: this.orderStatus, //-1:全部 1、待发货 11、待付款 3、已发货 0 、已取消 4、交易成功
searchValue: this.searchValue, //搜索
pageType: 2, //1、代表优惠券订单列表 2、礼品订单
beginTime: this.beginTime,
endTime: this.endTime,
sortType: this.sortType,
integralMallProId: this.integralMallProId ? this.integralMallProId : ''
};
window.localStorage.setItem('giftOrderObj', JSON.stringify(this.giftOrderObj));
this.$router.push({ name: 'orderDetail', query: { integralMallProExchangeId: item.integralMallProExchangeId } });
}
},
components: {
......@@ -713,6 +815,11 @@ export default {
.pagination-conteiner {
padding: 30px 16px 34px 0;
}
.go-link {
color: #1890ff;
cursor: pointer;
}
.drop-list .icon-icon- {
color: #909399;
margin-left: 5px;
......
src/views/order/importInfo.vue
......@@ -5,7 +5,7 @@
<el-form-item label="选择文件" required>
<div>
<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-upload>
</div>
......@@ -44,6 +44,9 @@ export default {
return {
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',
headersUpload: {
sign: ''
},
dialogForm: {},
errorList: [],
showList: false,
......@@ -75,6 +78,11 @@ export default {
this.$message.error('请上传小于2MB的文件');
return false;
}
if (localStorage.getItem('sign')) {
this.headersUpload.sign = localStorage.getItem('sign');
} else {
this.headersUpload.sign = '';
}
this.loading = true;
this.fileName = file.name;
},
......
src/views/order/orderDetail.vue 0 → 100644
<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 :to="{ path: '/giftExchange' }">礼品</el-breadcrumb-item>
<el-breadcrumb-item>订单详情</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>订单详情</span>
</h3>
</div>
<div class="section">
<div class="progress-content" v-if="orderStatus > 0">
<div class="progress-info progress-infoed">
<p class="info-title">买家下单</p>
<p class="info-time">{{ orderDetail.createTime ? getTimeAll(orderDetail.createTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus !== 1 || orderStatus !== 2 || orderStatus !== 3 || orderStatus !== 4, 'progress-ed': orderStatus === 1 || orderStatus === 2 || orderStatus === 4 || orderStatus === 3 }">
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<i class="el-icon-arrow-right"></i>
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 1 || orderStatus === 2 || orderStatus === 3 || orderStatus === 4 }">
<p class="info-title">买家付款</p>
<p class="info-time" v-if="orderStatus === 1 || orderStatus === 2 || orderStatus === 3 || orderStatus === 4">{{ orderDetail.payTime ? getTimeAll(orderDetail.payTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus === 1 || orderStatus === 3, 'progress-ed': orderStatus === 3 || orderStatus === 4 }">
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<i class="el-icon-arrow-right"></i>
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 3 || orderStatus === 4 }">
<p class="info-title">商家发货</p>
<p class="info-time" v-if="orderStatus === 3 || orderStatus === 4">{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '- -' }}</p>
</div>
<div class="progress-img" :class="{ 'progress-ing': orderStatus === 3 || orderStatus === 4, 'progress-ed': orderStatus === 4 }">
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<div class="progress-circle"></div>
<i class="el-icon-arrow-right"></i>
</div>
<div class="progress-info" :class="{ 'progress-infoed': orderStatus === 4 }">
<p class="info-title">交易成功</p>
<p class="info-time" v-if="orderStatus === 4">{{ orderDetail.finishTime ? getTimeAll(orderDetail.finishTime) : '- -' }}</p>
</div>
</div>
<div class="order-detail">
<div class="order-mess">
<h3>订单信息</h3>
<p class="order-mess-item">
<span>订单编号：</span>
<span>{{ orderDetail.definedCode }}</span>
<el-popover placement="bottom" trigger="hover">
<p>
<span>商户支付号：</span><span>{{ orderDetail.payNumber ? orderDetail.payNumber : '--' }}</span>
</p>
<p>
<span>支付流水号：</span><span>{{ orderDetail.transactionId ? orderDetail.transactionId : '--' }}</span>
</p>
<!-- <el-button slot="reference" type="text" class="iconfont icon-icon-"></el-button> -->
<i slot="reference" class="iconfont icon-icon-"></i>
</el-popover>
</p>
<p class="order-mess-item">
<span>会员名称：</span><span class="order-item-detail-mess">{{ orderDetail.memberName }}</span>
</p>
<p class="order-mess-item">
<span>买家卡号：</span>
<!-- <span>买家卡号：</span><span>{{ orderDetail.cardNum }}</span> -->
<span class="order-item-detail-mess">
<a :href="windowUrl + '/member/#/wechatmemberDetail?memberId=' + orderDetail.memberId" target="_blank">{{ orderDetail.cardNum ? orderDetail.cardNum : '' }}</a>
</span>
</p>
<p class="order-mess-item">
<span>配货方式：</span>
<span v-if="orderDetail.changeType === 1" class="order-item-detail-mess">微信兑换</span>
<span v-if="orderDetail.changeType === 2" class="order-item-detail-mess">快递发货</span>
<span v-if="orderDetail.changeType === 3" class="order-item-detail-mess">在线发货</span>
<span v-if="orderDetail.changeType === 4" class="order-item-detail-mess">门店自提</span>
<span v-if="orderDetail.changeType === 5" class="order-item-detail-mess">文本卡券</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType !== 4 && orderDetail.changeType !== 5">
<span>收货信息：</span><span class="order-item-detail-mess">{{ orderDetail.receivingAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货人：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPerson }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货手机：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPhone }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>自提点：</span><span class="order-item-detail-mess">{{ orderDetail.goodsPoint }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货地址：</span><span class="order-item-detail-mess">{{ orderDetail.goodsAddress }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 4">
<span>提货时间：</span><span class="order-item-detail-mess">{{ orderDetail.goodsTime ? orderDetail.goodsTime : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡号：</span><span class="order-item-detail-mess">{{ orderDetail.cardNumber ? orderDetail.cardNumber : '--' }}</span>
</p>
<p class="order-mess-item" v-if="orderDetail.changeType === 5">
<span>卡密/券码：</span><span class="order-item-detail-mess">{{ orderDetail.cardPassWord ? orderDetail.cardPassWord : '--' }}</span>
</p>
</div>
<div class="order-operate">
<!-- 待付款 或者 待发货没申请退款-->
<div v-if="orderStatus === 11">
<div class="operate-header">订单已提交成功，等待买家付款</div>
<el-button type="primary" class="operate-btn" @click="closeOrder">关闭订单</el-button>
</div>
<!-- 待发货不属于门店自提 -->
<div v-if="orderStatus === 1 && orderDetail.changeType !== 4">
<div class="operate-header">买家已付款，等待商家发货</div>
<div class="operate-tip">买家已付款到商家账户，请及时发货</div>
<el-button type="primary" class="operate-btn" @click="deliverOrder">发货</el-button>
<el-button plain class="operate-btn" v-if="orderStatus === 1 && orderDetail.refundStatus !== 2" @click="closeOrder">关闭订单</el-button>
</div>
<!-- 门店自提的待发货 -->
<div v-if="orderStatus === 1 && orderDetail.changeType === 4">
<div class="operate-header">买家已付款，等待商家发货</div>
<div class="operate-tip">买家已付款到商家账户，请及时发货</div>
<el-button type="primary" class="operate-btn" @click="deliverShop">发货并核销</el-button>
<el-button plain class="operate-btn" v-if="orderStatus === 1 && orderDetail.refundStatus !== 2" @click="closeOrder">关闭订单</el-button>
</div>
<!-- 已发货 -->
<div v-if="orderStatus === 3">
<div class="operate-header">商家已发货，等待交易成功</div>
<div class="operate-tip">等待买家确认收货</div>
</div>
<!-- 交易完成 -->
<div v-if="orderStatus === 4">
<div class="operate-header">交易成功</div>
<div class="operate-tip">订单交易完成</div>
</div>
<!-- 交易关闭 -->
<div v-if="orderStatus <= 0">
<div class="operate-header">交易关闭</div>
<div class="operate-tip">{{ orderDetail.cancelReason }}</div>
</div>
</div>
</div>
<div class="order-list">
<table class="order-table">
<thead>
<tr>
<th style="width:32%">商品</th>
<th style="width:15%">单价</th>
<th style="width:13%">数量</th>
<th style="width:15%">售后</th>
<th style="width:10%">小计</th>
<th style="width:15%" v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">操作</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<div class="order-goods-info">
<img :src="orderDetail.photoUrl" alt="" />
<div class="order-goods-mess">
<p class="goods-name">{{ orderDetail.proName }}</p>
<p v-for="(item, index) in orderDetail.sku" :key="index" class="goods-sku">
<span>{{ item.proName }}</span
>:{{ item.valueName }}
</p>
<p class="goods-procode">{{ orderDetail.proCode }}</p>
</div>
</div>
</td>
<td>
<div>{{ orderDetail.unitCostIntegral }}积分+{{ orderDetail.unitPrice }}元</div>
</td>
<td>{{ orderDetail.goodsNum }}</td>
<td>
<span v-if="orderStatus <= 0">交易关闭</span>
<span v-if="orderStatus === 11">待付款</span>
<span v-if="orderStatus === 3">已发货</span>
<span v-if="orderStatus === 4">交易成功</span>
<span v-if="orderStatus === 1 || orderStatus === 2">已付款</span>
</td>
<td>
<div>￥{{ orderDetail.cashShouldPay }}</div>
</td>
<td @click="getLogistics" v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">
<el-button type="text">{{ showLogistics ? '收起物流信息' : '展开物流信息' }}</el-button>
<i :class="showLogistics ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</td>
<!-- v-if="(orderStatus === 3 && orderDetail.changeType === 2) || orderDetail.changeType === 3 || ((orderStatus === 4 && orderDetail.changeType === 2) || orderDetail.changeType === 3)" -->
</tr>
</tbody>
</table>
<div v-if="(orderStatus === 3 && (orderDetail.changeType === 2 || orderDetail.changeType === 3)) || (orderStatus === 4 && (orderDetail.changeType === 2 || orderDetail.changeType === 3))">
<div class="logistics-info" v-if="showLogistics">
<div class="logistics-item">
<p class="logistics-info-item">
<span>快递：</span><span>{{ logisticsInfo.changeLog.logisticsCompanyName }}</span>
</p>
<p class="logistics-info-item">
<span>物流单号：</span><span>{{ logisticsInfo.changeLog.courierNumber }}</span>
</p>
<p class="logistics-info-item">
<span>发货时间：</span><span>{{ orderDetail.deliveryTime ? getTimeAll(orderDetail.deliveryTime) : '--' }}</span>
</p>
</div>
<div class="logisticsList">
<ul class="el-timeline is-reverse">
<li class="el-timeline-item" v-for="(i, v) in logisticsInfo.traces" :key="v">
<div class="el-timeline-item__tail"></div>
<div class="el-timeline-item__node el-timeline-item__node--normal el-timeline-item__node--"></div>
<div class="el-timeline-item__wrapper">
<div class="el-timeline-item__content">{{ i.acceptStation }}</div>
<div class="el-timeline-item__timestamp is-bottom">{{ i.acceptTime }}</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="table-bottom">
<span>实付金额：</span>
<span class="pay-money">{{ orderDetail.unitCostIntegral }}积分+{{ orderDetail.payCost }}元</span>
</div>
</div>
</div>
</div>
<!-- 关闭订单 -->
<closeOrder :refunOrderdModal="refunOrderdModal" @getList="getList"></closeOrder>
<!-- 发货 -->
<deliverModal :deliverdModal="deliverdModal" @getList="getList" v-show="deliverdModal.dialogVisible"></deliverModal>
<!-- 门店自提核销 -->
<el-dialog title="发货并核销" :visible.sync="shopDialogVisible" width="450px">
<p style="margin-bottom:20px">
请确认买家出示的提货码为：<span style="color:#f5222d">{{ orderDetail.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>
</div>
</template>
<script>
import qs from 'qs';
import request from '../../service/request.js';
import getInputVal from '../../utils/common.js';
import closeOrder from './closeOrder';
import deliverModal from './delive';
export default {
data() {
return {
getTimeAll: getInputVal.formatDate,
integralMallProExchangeId: '', //订单id
orderStatus: 0, //订单状态
orderDetail: {}, //订单详情
logisticsInfo: {}, //物流信息
showLogistics: false,
windowUrl: window.location.origin,
refunOrderdModal: {
//关闭订单
dialogVisible: false,
integralMallProExchangeId: ''
},
deliverdModal: {
//发货
dialogVisible: false,
changeType: '',
integralMallProExchangeId: '',
consignee: '', //收件人
consigneePhone: '', //联系方式
receivingAddress: '', //收货地址
logisticsCompanyId: '',
logisticsCode: '',
otherLogisticsCompanyName: ''
},
shopDialogVisible: false, //门店自提
submitLoading: false //门店自提确认按钮
};
},
created() {
window.onbeforeunload = function(e) {
// var storage = window.localStorage;
// storage.clear('giftOrderObj');
localStorage.removeItem('giftOrderObj');
};
this.integralMallProExchangeId = this.$route.query.integralMallProExchangeId;
this.getOrderDetail();
},
methods: {
//订单详情
getOrderDetail() {
let params = {
integralMallProExchangeId: this.integralMallProExchangeId
};
request.get('/api-integral-mall/get_gift_order_info', { params }).then(res => {
if (res.data.errorCode === 0) {
this.orderStatus = res.data.result.status;
this.orderDetail = res.data.result;
if (res.data.result.sku) {
this.orderDetail.sku = JSON.parse(res.data.result.sku);
}
} else {
this.$message.error(res.data.message);
}
});
},
//获取物流详情
getLogistics() {
if (!this.showLogistics) {
let params = {
integralMallProExchangeId: this.integralMallProExchangeId
};
request.post('/api-integral-mall/list-logistics-traces', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.logisticsInfo = res.data.result;
this.showLogistics = true;
} else {
this.$message.error(res.data.message);
}
});
} else {
this.showLogistics = false;
}
},
//关闭订单
closeOrder() {
if (this.orderStatus === 11) {
//待付款
let params = {
integralMallProExchangeId: this.integralMallProExchangeId,
optType: 4
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
this.getOrderDetail();
} else {
this.$message.error(res.data.message);
}
});
} else if (this.orderStatus === 1 && this.orderDetail.refundStatus !== 2) {
//待发货的并且为申请退款的
this.refunOrderdModal.integralMallProExchangeId = this.integralMallProExchangeId;
this.refunOrderdModal.dialogVisible = true;
}
},
// 发货
deliverOrder() {
// 获取快递发货的信息
let params = {
integralMallProExchangeId: this.integralMallProExchangeId
};
request.post('/api-integral-mall/list-logistics-traces', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
this.deliverdModal.integralMallProExchangeId = this.integralMallProExchangeId;
this.deliverdModal.changeType = this.orderDetail.changeType;
this.deliverdModal.consignee = res.data.result.changeLog.consignee; //收件人
this.deliverdModal.consigneePhone = res.data.result.changeLog.consigneePhone; //联系方式
this.deliverdModal.receivingAddress = res.data.result.changeLog.receivingAddress; //收货地址
this.deliverdModal.deliverStatus = true;
this.deliverdModal.dialogVisible = true;
} else {
this.$message.error(res.data.message);
}
});
},
getList() {
this.getOrderDetail();
},
// 门店自提发货
deliverShop() {
this.shopDialogVisible = true;
},
// 确认门店自提
hanhdleShopDeliver() {
let params = {
optType: 1,
integralMallProExchangeId: this.integralMallProExchangeId,
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.getOrderDetail();
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
}
},
components: {
closeOrder,
deliverModal
}
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding: 24px 32px;
}
/* 进度 */
.progress-content {
height: 116px;
border-bottom: 1px solid #ebeef5;
margin-bottom: 14px;
display: -ms-flexbox;
display: flex;
-ms-flex-pack: center;
justify-content: center;
-ms-flex-align: center;
align-items: center;
}
.progress-info {
font-size: 13px;
color: #bbc2cb;
text-align: center;
position: relative;
}
.info-title {
line-height: 18px;
width: 70px;
}
.info-time {
min-width: 110px;
line-height: 18px;
white-space: nowrap;
position: absolute;
font-size: 13px;
top: 24px;
left: -30%;
text-align: center;
white-space: nowrap;
}
.progress-img {
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
margin: 0 10px;
}
.progress-circle {
width: 8px;
height: 8px;
background-color: #bbc2cb;
border-radius: 50%;
margin-right: 6px;
transform: scale(0.5);
}
.progress-img .el-icon-arrow-right {
color: #bbc2cb;
}
.progress-infoed {
color: #303133;
}
.progress-ing .progress-circle:nth-child(-n + 7) {
background-color: #67c23a;
}
/* .progress-ing .progress-circle {
background-color: #67c23a;
} */
.progress-ed .progress-circle {
background-color: #67c23a;
}
.progress-ing .el-icon-arrow-right {
color: #bbc2cb;
}
.progress-ed .el-icon-arrow-right {
color: #67c23a;
}
/* 订单信息 */
.order-detail {
display: flex;
}
.order-mess {
width: 300px;
border-right: 1px solid #ebeef5;
}
.order-mess h3 {
height: 48px;
line-height: 48px;
color: #303133;
font-size: 13px;
padding-left: 15px;
background-color: #f1f3f7;
width: 285px;
}
.order-mess-item {
font-size: 13px;
line-height: 18px;
color: #303133;
margin: 8px 0;
/* display: flex; */
}
.order-mess-item span:first-child {
width: 80px;
margin-right: 10px;
text-align: right;
display: inline-block;
}
.order-item-detail-mess {
display: inline-block;
width: 200px;
vertical-align: top;
word-break: break-all;
}
.order-operate {
border-bottom: 1px solid #ebeef5;
padding-left: 90px;
flex: 1;
margin-left: 15px;
}
.operate-header {
font-size: 18px;
color: #606266;
margin: 36px 0 12px 0;
}
.operate-tip {
font-size: 13px;
color: #409eff;
}
.operate-btn {
margin-top: 40px;
}
.order-list {
margin-top: 22px;
}
/* 表格 */
.order-table {
width: 100%;
}
.order-table thead tr {
height: 48px;
line-height: 48px;
background: #f1f3f7;
border-bottom: 1px solid #e4e7ed;
color: #303133;
font-weight: 500;
font-size: 14px;
}
.order-table thead th {
text-align: left;
padding: 0 25px;
}
.order-table tbody tr {
color: #303133;
font-size: 14px;
border-bottom: 1px solid #e4e7ed;
}
.order-table tbody tr:hover {
background: #f5f7fa;
}
.order-table tbody td {
text-align: left;
padding: 12px 25px;
vertical-align: middle;
}
.el-icon-arrow-down {
font-size: 14px;
color: #409eff;
cursor: pointer;
}
.el-icon-arrow-up {
font-size: 14px;
color: #409eff;
cursor: pointer;
}
.order-goods-info img {
width: 64px;
height: 64px;
border-radius: 4px;
}
.order-goods-mess {
margin-left: 5px;
display: inline-block;
vertical-align: top;
width: 72%;
}
.goods-name {
font-size: 14px;
color: #303133;
line-height: 18px;
margin-bottom: 7px;
}
.goods-sku {
font-size: 13px;
color: #909399;
line-height: 18px;
display: inline-block;
margin-right: 5px;
}
.goods-procode {
font-size: 13px;
color: #909399;
line-height: 18px;
}
/* 物流信息 */
.logistics-info {
height: 200px;
width: 100%;
border-bottom: 1px solid #e4e7ed;
display: flex;
padding: 22px 0;
}
.logistics-item {
width: 400px;
padding: 25px 40px 0 40px;
border-right: 1px dashed #e4e7ed;
/* text-align: center; */
/* margin-top: 25px; */
}
.logistics-info-item {
font-size: 13px;
line-height: 18px;
color: #303133;
margin: 8px 0;
margin: 20px 0;
display: flex;
/* white-space: nowrap; */
}
.logistics-info-item span:first-child {
min-width: 80px;
text-align: right;
display: inline-block;
}
.logistics-info-item span:last-child {
min-width: 80px;
display: inline-block;
}
.table-bottom {
text-align: right;
margin-top: 22px;
font-size: 14px;
}
.pay-money {
color: #ff4040;
}
/* 时间线样式 */
.logisticsList {
padding-top: 15px;
height: 200px;
overflow-y: auto;
margin-left: 40px;
width: 100%;
}
.el-timeline {
margin: 0;
font-size: 14px;
list-style: none;
}
.el-timeline-item {
position: relative;
padding-bottom: 20px;
}
.el-timeline-item__tail {
position: absolute;
left: 4px;
height: 100%;
border-left: 2px solid #e4e7ed;
}
.el-timeline-item__node {
position: absolute;
background-color: #e4e7ed;
border-radius: 50%;
display: flex;
justify-content: center;
align-items: center;
}
.el-timeline-item__node--normal {
left: -1px;
width: 12px;
height: 12px;
}
.el-timeline-item__wrapper {
position: relative;
padding-left: 28px;
top: -3px;
}
.el-timeline-item__content {
color: #303133;
}
.el-timeline-item__timestamp {
color: #909399;
line-height: 1;
font-size: 13px;
}
.el-timeline-item__timestamp.is-bottom {
margin-top: 8px;
}
.icon-icon- {
color: #606266;
cursor: pointer;
}
.icon-icon-:hover {
color: #303133;
}
</style>
src/views/order/refundList.vue
......@@ -3,6 +3,7 @@
<div class="mall-content-section">
<div class="mall-content-title" style="border:none">
<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>
......@@ -38,7 +39,7 @@
<div class="goods-list-content">
<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 label="礼品信息" min-width="220px">
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
<div class="gift-info">
<img :src="scope.row.photoUrl" />
......@@ -107,7 +108,8 @@
<p style="line-height:18px;" v-if="scope.row.refundStatus === 2">退款关闭</p>
<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.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>
</p>
</template>
......@@ -129,6 +131,17 @@
</div>
</el-tabs>
</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>
<!-- 同意退款 -->
......@@ -192,7 +205,11 @@ export default {
logisticsCompanyId: '',
logisticsCode: '',
otherLogisticsCompanyName: ''
}
},
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false //门店自提确认按钮
};
},
created() {
......@@ -309,6 +326,38 @@ export default {
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: {
......
src/views/setting/deliverSet.vue 0 → 100644
<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>
src/views/setting/editDeliver.vue 0 → 100644
<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 :to="{ path: '/deliverSet' }">配送设置</el-breadcrumb-item>
<el-breadcrumb-item>自提点设置</el-breadcrumb-item>
</el-breadcrumb>
<h3>
<span>自提点设置</span>
</h3>
</div>
<div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="140px" class="demo-ruleForm" label-position="right">
<div class="section-content">
<h3>自提点信息</h3>
<el-form-item label="自提点类型" required>
<template>
<el-radio v-model="form.shopType" :label="0">从门店中选择</el-radio>
<!-- <el-radio v-model="radio" label="1">手动新增自提点</el-radio> -->
</template>
</el-form-item>
<el-form-item label="选择门店" required v-if="integralMallPickUpPointId === '-1'" class="shop-content">
<vue-gic-store-new :options="options" :isAdd="isAdd" :uuid.sync="uuid" ref="storeGroup" @store-chane="storeChange"></vue-gic-store-new>
</el-form-item>
<el-form-item label="自提点名称" required v-if="integralMallPickUpPointId !== '-1'">
<el-input v-model="form.pickUpPointName" class="w-600" type="text" disabled> </el-input>
</el-form-item>
<el-form-item label="联系电话" required v-if="integralMallPickUpPointId !== '-1'">
<el-input v-model="form.pickUpPointPhone" class="w-600" type="text" disabled> </el-input>
</el-form-item>
<el-form-item label="自提点地址" required v-if="integralMallPickUpPointId !== '-1'">
<el-input v-model="form.pickUpPointAddress" class="w-600" type="text" disabled> </el-input>
</el-form-item>
<el-form-item label="自提点图片" required v-if="integralMallPickUpPointId !== '-1'">
<div v-for="(item, index) in form.pickUpPointImageList" :key="index" class="img-list">
<img :src="item" alt="" />
</div>
</el-form-item>
<el-form-item label="营业时间" required v-if="integralMallPickUpPointId !== '-1'" class="time-range">
<el-time-select placeholder="起始时间" v-model="form.pickUpPointOpenTime" disabled> </el-time-select>
至
<el-time-select placeholder="起始时间" v-model="form.pickUpPointCloseTime" disabled> </el-time-select>
</el-form-item>
</div>
<div class="section-content">
<h3>自提设置</h3>
<el-form-item label="买家可选自提时间">
<el-switch v-model="form.status"> </el-switch>
<div class="tip-warm">
<p>若不开启，则默认买家付款后即可在任意时间提货</p>
<p>若开启，则买家需选择自提时间，商户需按约定时间备货完成</p>
</div>
</el-form-item>
<div v-if="form.status">
<el-form-item label="商户备货设置" required>
<template>
<div class="radio-item">
<el-radio v-model="form.radio" :label="1">下单当天</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeHours">
<el-input type="text" v-model="form.timeHours" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>小时</span>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeMinuter">
<el-input type="text" v-model="form.timeMinuter" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>分钟后，买家可提货</span>
</div>
<div class="radio-item">
<el-radio v-model="form.radio" :label="2">下单</el-radio>
<el-form-item style="display:inline-block;margin-left:0px" prop="timeDay">
<el-input type="text" v-model="form.timeDay" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>天后，买家可提货</span>
</div>
</template>
</el-form-item>
<el-form-item label="买家自提时段" required></el-form-item>
<div style="margin-top:-45px;">
<el-form-item v-for="(v, i) in form.timeRangeList" :key="i" :prop="'timeRangeList.' + i + '.timeRange'" :rules="[{ validator: validateTime, trigger: 'change' }]">
<el-time-picker :clearable="clearableBtn" class="w-280" format="HH:mm" is-range v-model="v.timeRange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" @change="value => limitTimeSelect(i, value)" @focus="value => blurLimitTimeSelect(i, value)"> </el-time-picker>
<el-button v-if="i" type="text" @click="deleteTime(i)">删除</el-button>
<span v-if="!i" style="font-size:12px;color:#909399;line-height:12px;margin-left:10px;">请使用24小时制输入时间，格式如11:00至14:30</span>
</el-form-item>
<p><el-button type="text" style="margin:0px 0 10px 170px" @click="addTime">添加时间段</el-button></p>
</div>
</div>
</div>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn" style="margin-left:32px;">
<el-button type="primary" size="small" :loading="submitLoading" @click="submitForm('form')">保存</el-button>
<el-button size="small" @click="goBack">返回</el-button>
</el-form-item>
</div>
</el-form>
</div>
</div>
</div>
</template>
<script>
// import qs from 'qs';
import request from '../../service/request.js';
import getInputVal from '../../utils/common.js';
// import stockModal from '../../../components/getSkuList';
export default {
data() {
let timeHoursValidator = (rule, value, callback) => {
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 2) {
if (!value) {
callback();
}
} else if (this.form.radio === 1) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入0-23之间的整数'));
} else if (Number(value) > 23) {
callback(new Error('请输入0-23之间的整数'));
} else {
callback();
}
};
let timeMinuterValidator = (rule, value, callback) => {
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 2) {
if (!value) {
callback();
}
} else if (this.form.radio === 1) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入0-59之间的整数'));
} else if (Number(value) > 59) {
callback(new Error('请输入0-59之间的整数'));
} else {
callback();
}
};
let timeDayValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
// var reg = /^\+?(0|[1-9][0-9]*)$/;
if (this.form.radio === 1) {
if (!value) {
callback();
}
} else if (this.form.radio === 2) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入1-90之间的整数'));
} else {
callback();
}
};
let orderTimeHoursValidator = (rule, value, callback) => {
// var reg = /^[1-9]\d*$/;
var reg = /^\+?(0|[1-9][0-9]*)$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入0-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入0-90之间的整数'));
} else {
callback();
}
};
let validateTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入时间'));
} else {
callback();
}
};
return {
fixedWidth: document.documentElement.clientWidth - 200,
getHours: getInputVal.getHours,
form: {
shopType: 0,
pickUpPointName: '',
pickUpPointPhone: '',
pickUpPointAddress: '',
pickUpPointImageList: [],
pickUpPointOpenTime: '', //营业开始时间
pickUpPointCloseTime: '', //营业关闭时间
status: false,
radio: 1,
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
timeRangeList: [{ timeRange: '' }],
orderTimeHours: '',
validateTime
},
formRules: {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }]
},
validateTime,
// 门店控件
uuid: '', // 新增传空，编辑必传,
options: [0, 1, 2, 3, 4, 5], // 需要的下拉 默认为全部[0,1,2,3,4,5]// 0 全部 1 门店类型 2门店标签 3 门店区域 4 门店分组 5 部分门店
isAdd: true,
storeWidgetKey: '', //传递的门店的KeyId
integralMallPickUpPointId: '-1', //自提点id
clearableBtn: false
};
},
created() {
this.integralMallPickUpPointId = this.$route.query.integralMallPickUpPointId;
if (this.integralMallPickUpPointId !== '-1') {
this.getInfo();
}
// else {
// //新增时候的时间段选择
// let currentTime = new Date(new Date().valueOf());
// let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
// this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
// }
},
methods: {
//添加时间段
addTime() {
if (this.form.timeRangeList.length >= 5) {
this.$message.error('最多五个时间段');
return false;
}
if (this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange) {
//上一个时间存在添加
let time1 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 1).valueOf());
let time2 = new Date((new Date(this.form.timeRangeList[this.form.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 2).valueOf());
this.form.timeRangeList.push({ timeRange: [time1, time2] });
} else {
this.form.timeRangeList.push({ timeRange: null });
}
},
//时间限制
limitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (selectTime === selectTimeEnd) {
this.$message.error('时间不可重叠！');
this.form.timeRangeList[index].timeRange = null;
}
if (index !== 0) {
//不是第一个
// // 和前面的时间比较
for (let i = index - 1; i >= 0; i--) {
if (this.form.timeRangeList[i].timeRange) {
let selectTimePrev = new Date(this.form.timeRangeList[i].timeRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
this.$message.error('时间不可重叠！');
this.form.timeRangeList[index].timeRange = null;
}
}
}
//和后面的时间比较
for (let j = index + 1; j < this.form.timeRangeList.length; j++) {
if (this.form.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.form.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
this.form.timeRangeList[index].timeRange = null;
}
}
}
} else {
//和后面的时间比较
for (let j = index + 1; j < this.form.timeRangeList.length; j++) {
if (this.form.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.form.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
this.form.timeRangeList[index].timeRange = null;
}
}
}
}
},
blurLimitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (selectTime === selectTimeEnd) {
this.$message.error('时间不可重叠！');
this.form.timeRangeList[index].timeRange = null;
}
},
//删除时间段
deleteTime(index) {
this.form.timeRangeList.splice(index, 1);
},
//获取编辑信息
getInfo() {
let params = {
integralMallPickUpPointId: this.integralMallPickUpPointId
};
request.get('/api-integral-mall/get-pick-up-point', { params }).then(res => {
if (res.data.errorCode === 0) {
this.integralMallPickUpPointId = res.data.result.integralMallPickUpPointId;
this.form.shopType = res.data.result.pickUpPointType;
this.form.pickUpPointName = res.data.result.pickUpPointName;
this.form.pickUpPointPhone = res.data.result.pickUpPointPhone;
this.form.pickUpPointAddress = res.data.result.pickUpPointAddress;
this.form.pickUpPointImageList = res.data.result.pickUpPointImageList;
this.form.pickUpPointOpenTime = res.data.result.pickUpPointOpenTime;
this.form.pickUpPointCloseTime = res.data.result.pickUpPointCloseTime;
if (res.data.result.settingDTO.canChooseTime === 0) {
//自提时间关闭
this.form.radio = 1;
} else {
this.form.radio = res.data.result.settingDTO.delayTimeType;
}
this.form.status = res.data.result.settingDTO.canChooseTime === 1 ? true : false;
this.form.timeHours = res.data.result.settingDTO.delayHour;
this.form.timeMinuter = res.data.result.settingDTO.delayMinute;
this.form.timeDay = res.data.result.settingDTO.delayDay;
if (res.data.result.settingDTO.canChooseTime === 0) {
//自提时间关闭
let currentTime = new Date(new Date().valueOf());
let currentTime1 = new Date(new Date(new Date().getTime() + 1000 * 60).valueOf());
this.form.timeRangeList[0].timeRange = [currentTime, currentTime1];
} else {
if (res.data.result.settingDTO.choosenTime) {
this.form.timeRangeList = [];
for (let item of res.data.result.settingDTO.choosenTime) {
let currentYear = new Date().getFullYear();
let currentMonth = new Date().getMonth() + 1;
let currentDate = new Date().getDate();
let time1 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.start + ':00').valueOf());
let time2 = new Date(new Date(currentYear + '-' + currentMonth + '-' + currentDate + ' ' + item.end + ':00').valueOf());
this.form.timeRangeList.push({ timeRange: [time1, time2] });
}
}
}
} else {
this.$message.error(res.data.message);
}
});
},
// 门店控件
// 一些方法 根据具体业务需求选用
/*
* 获取组件选中的值
* data返回示例：{list:[{id:'1',name:'名称'}],type:1}
*/
getStoreConfig() {
this.refs.storeNew.getStoreConfig().then(data => {
this.storeConfig = data;
});
},
/* 判断门店选择是否为空
* 返回promise对象，flag为true or false ，true已保存，false未保存
*
*/
isStoreSave() {
this.refs.storeNew.isStoreSave().then(flag => {
//do something 返回bool值
return flag;
});
},
storeChange() {
this.storeWidgetKey = this.uuid;
},
//保存
async submitForm(form) {
if (this.integralMallPickUpPointId === '-1') {
let flag = await this.$refs.storeGroup.isStoreSave();
if (!flag) {
//未选择门店
this.$message.error('请选择门店信息');
return false;
}
}
let params = {};
let url = '';
if (this.integralMallPickUpPointId === '-1') {
//新增
params = {
storeWidgetKey: this.uuid,
pickUpPointType: this.form.shopType,
settingVo: {
canChooseTime: this.form.status ? 1 : 0,
delayTimeType: this.form.status ? this.form.radio : null,
delayHour: this.form.timeHours ? Number(this.form.timeHours) : null,
delayMinute: this.form.timeMinuter ? Number(this.form.timeMinuter) : null,
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: []
}
};
let arrObj = [];
for (let item of this.form.timeRangeList) {
if (item.timeRange) {
arrObj.push({
start: this.getHours(item.timeRange[0]),
end: this.getHours(item.timeRange[1])
});
}
}
if (!this.form.status) {
params.settingVo.choosenTime = [];
} else {
params.settingVo.choosenTime = arrObj;
}
url = '/api-integral-mall/create-pick-up-points';
} else {
//编辑
params = {
integralMallPickUpPointId: this.integralMallPickUpPointId,
pickUpPointType: this.form.shopType,
settingVo: {
canChooseTime: this.form.status ? 1 : 0,
delayTimeType: this.form.status ? this.form.radio : null,
delayHour: this.form.timeHours ? Number(this.form.timeHours) : null,
delayMinute: this.form.timeMinuter ? Number(this.form.timeMinuter) : null,
delayDay: this.form.timeDay ? Number(this.form.timeDay) : null,
choosenTime: []
}
};
let arrObj = [];
for (let item of this.form.timeRangeList) {
if (item.timeRange) {
arrObj.push({
start: this.getHours(item.timeRange[0]),
end: this.getHours(item.timeRange[1])
});
}
}
if (!this.form.status) {
params.settingVo.choosenTime = [];
} else {
params.settingVo.choosenTime = arrObj;
}
url = '/api-integral-mall/update-pick-up-points';
}
this.$refs[form].validate(valid => {
if (valid) {
this.submitLoading = true;
request.post(url, params).then(res => {
if (res.data.errorCode === 0) {
this.submitLoading = false;
this.$router.push({
name: 'deliverSet'
});
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
return false;
}
});
},
goBack() {
this.$router.push({
name: 'deliverSet'
});
}
},
components: {}
};
</script>
<style scoped>
.section {
background: #fff;
margin: 24px;
padding-bottom: 24px;
margin-bottom: 0px;
}
.section-content h3 {
height: 55px;
line-height: 55px;
border-bottom: 1px solid #e4e7ed;
font-weight: 500;
margin-bottom: 25px;
padding-left: 32px;
font-size: 16px;
}
.section-content .el-form-item {
margin-left: 32px;
}
.w-600 {
width: 600px;
}
.tip-warm {
display: inline-block;
vertical-align: top;
margin-left: 30px;
}
.tip-warm p {
font-size: 12px;
color: rgb(144, 147, 153);
line-height: 18px;
}
.radio-item {
margin-bottom: 22px;
}
.radio-item:last-child {
margin-bottom: 0px;
}
.w-280 {
width: 280px !important;
}
.img-list {
display: inline-block;
margin-right: 10px;
vertical-align: top;
}
.img-list img {
width: 110px;
height: 110px;
border-radius: 4px;
border: 1px solid #e4e7ed;
}
/* .time-range .el-date-editor .el-range__close-icon {
display: none !important;
} */
</style>
<style>
.shop-content .dm-store__inputtag--total {
top: 2px;
}
</style>
src/views/setting/pickedAuto.vue 0 → 100644
<template>
<el-dialog title="自提设置" :visible.sync="pickedForm.dialogVisible" width="750px" @close="cancelSubmit('pickedModal')">
<el-form :model="pickedModal" ref="pickedModal" :rules="modalRules" label-width="150px">
<el-form-item label="买家可选自提时间">
<el-switch v-model="pickedModal.status"> </el-switch>
<div class="tip-warm">
<p>若不开启，则默认买家付款后即可在任意时间提货</p>
<p>若开启，则买家需选择自提时间，商户需按约定时间备货完成</p>
</div>
</el-form-item>
<div v-if="pickedModal.status">
<el-form-item label="商户备货设置" required>
<template>
<div class="radio-item">
<el-radio v-model="pickedModal.radio" :label="1">下单当天</el-radio>
<el-form-item style="display:inline-block" prop="timeHours">
<el-input type="text" v-model="pickedModal.timeHours" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>小时</span>
<el-form-item style="display:inline-block" prop="timeMinuter">
<el-input type="text" v-model="pickedModal.timeMinuter" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>分钟后，买家可提货</span>
</div>
<div class="radio-item">
<el-radio v-model="pickedModal.radio" :label="2">下单</el-radio>
<el-form-item style="display:inline-block" prop="timeDay">
<el-input type="text" v-model="pickedModal.timeDay" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>天后，买家可提货</span>
</div>
</template>
</el-form-item>
<el-form-item label="买家自提时段" required></el-form-item>
<div style="margin-top:-45px;">
<el-form-item v-for="(v, i) in pickedModal.timeRangeList" :key="i" :prop="'timeRangeList.' + i + '.timeRange'" :rules="[{ validator: validateTime, trigger: 'change' }]">
<el-time-picker class="w-280" :clearable="clearableBtn" is-range v-model="v.timeRange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" format="HH:mm" :editable="false" placeholder="选择时间范围" @change="val => limitTimeSelect(i, val)" @focus="value => blurLimitTimeSelect(i, value)"> </el-time-picker>
<el-button v-if="i" type="text" @click="deleteTime(i)">删除</el-button>
<span v-if="!i" style="font-size:12px;color:#909399;line-height:12px;margin-left:10px;">请使用24小时制输入时间，格式如11:00至14:30</span>
</el-form-item>
<p><el-button type="text" style="margin:0px 0 10px 150px" @click="addTime">添加时间段</el-button></p>
</div>
<!-- <el-form-item label="提货有效期" required>
<span>备货完成</span>
<el-form-item style="display:inline-block" prop="orderTimeHours">
<el-input type="text" v-model="pickedModal.orderTimeHours" style="width:120px;" size="mini"> </el-input>
</el-form-item>
<span>天后，停止自提</span>
<span style="font-size:12px;color:#909399;line-height:12px;margin-left:30px;">超期后，订单自动核销</span>
</el-form-item> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit('pickedModal')">取 消</el-button>
<el-button type="primary" :loading="submitLoading" @click="submit('pickedModal')">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
// import qs from 'qs';
import request from '../../service/request.js';
// import copy from '../../utils/clone.js';
import getInputVal from '../../utils/common.js';
export default {
props: {
pickedForm: {
type: Object,
default() {
return {};
}
}
},
data() {
let timeHoursValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
if (this.pickedModal.radio === 2) {
if (!value) {
callback();
}
} else if (this.pickedModal.radio === 1) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-23之间的整数'));
} else if (Number(value) > 23) {
callback(new Error('请输入1-23之间的整数'));
} else {
callback();
}
};
let timeMinuterValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
if (this.pickedModal.radio === 2) {
if (!value) {
callback();
}
} else if (this.pickedModal.radio === 1) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-59之间的整数'));
} else if (Number(value) > 59) {
callback(new Error('请输入1-59之间的整数'));
} else {
callback();
}
};
let timeDayValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
if (this.pickedModal.radio === 1) {
if (!value) {
callback();
}
} else if (this.pickedModal.radio === 2) {
if (!value) {
callback(new Error('请输入时间'));
}
}
if (!reg.test(Number(value))) {
callback(new Error('请输入1-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入1-90之间的整数'));
} else {
callback();
}
};
let orderTimeHoursValidator = (rule, value, callback) => {
var reg = /^[1-9]\d*$/;
if (!reg.test(Number(value))) {
callback(new Error('请输入1-90之间的整数'));
} else if (Number(value) > 90) {
callback(new Error('请输入1-90之间的整数'));
} else {
callback();
}
};
let validateTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入时间'));
} else {
callback();
}
};
return {
getHours: getInputVal.getHours,
pickedModal: {
dialogVisible: true,
status: false,
radio: 1,
timeHours: '', //小时
timeMinuter: '', //分钟
timeDay: '',
timeRangeList: [{ timeRange: '' }],
orderTimeHours: ''
},
validateTime,
modalRules: {
timeHours: [{ validator: timeHoursValidator, trigger: 'blur' }],
timeMinuter: [{ validator: timeMinuterValidator, trigger: 'blur' }],
timeDay: [{ validator: timeDayValidator, trigger: 'blur' }],
orderTimeHours: [{ required: true, message: '请输入时间', trigger: 'blur' }, { validator: orderTimeHoursValidator, trigger: 'blur' }]
},
submitLoading: false,
clearableBtn: false
};
},
// created() {
// 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];
// },
methods: {
//添加时间段
addTime() {
if (this.pickedModal.timeRangeList.length >= 5) {
this.$message.error('最多五个时间段');
return false;
}
if (this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange) {
//上一个时间存在添加
let time1 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 2).valueOf());
let time2 = new Date((new Date(this.pickedModal.timeRangeList[this.pickedModal.timeRangeList.length - 1].timeRange[1]).getTime() + 1000 * 60 * 3).valueOf());
this.pickedModal.timeRangeList.push({ timeRange: [time1, time2] });
} else {
this.pickedModal.timeRangeList.push({ timeRange: [] });
}
},
//删除时间段
deleteTime(index) {
this.pickedModal.timeRangeList.splice(index, 1);
},
//时间限制
limitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (selectTime === selectTimeEnd) {
this.$message.error('时间不可重叠！');
this.pickedModal.timeRangeList[index].timeRange = null;
}
if (index !== 0) {
//不是第一个
// 和前面的时间比较
for (let i = index - 1; i >= 0; i--) {
if (this.pickedModal.timeRangeList[i].timeRange) {
let selectTimePrev = new Date(this.pickedModal.timeRangeList[i].timeRange[1]).valueOf();
//和前前一个的存在的结束时间比较
if (selectTime < selectTimePrev) {
this.$message.error('时间不可重叠！');
this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
//和后面的时间比较
for (let j = index + 1; j < this.pickedModal.timeRangeList.length; j++) {
if (this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
} else {
//和后面的时间比较
for (let j = index + 1; j < this.pickedModal.timeRangeList.length; j++) {
if (this.pickedModal.timeRangeList[j].timeRange) {
let selectTimeAfter = new Date(this.pickedModal.timeRangeList[j].timeRange[0]).valueOf();
//和后一个的存在的开始时间比较
if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
this.$message.error('时间不可重叠！');
this.this.pickedModal.timeRangeList[index].timeRange = null;
}
}
}
}
// if (index !== 0) {
// //不是第一个
// if (this.pickedModal.timeRangeList[index - 1].timeRange) {
// //前一个存在
// if (val) {
// let selectTime = new Date(val[0]).valueOf();
// let selectTimeEnd = new Date(val[1]).valueOf();
// let selectTimePrev = new Date(this.pickedModal.timeRangeList[index - 1].timeRange[1]).valueOf(); //选中的前一个的结束时间
// //和前一个的结束时间比较
// if (selectTime < selectTimePrev) {
// this.$message.error('时间不可重叠！');
// let time1 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 1).valueOf());
// let time2 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 2).valueOf());
// this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
// }
// //和后一个的开始时间比较
// if (this.pickedModal.timeRangeList.length - 1 > index) {
// let selectTimeAfter = new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).valueOf(); //选中的后一个的开始时间
// if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
// this.$message.error('时间不可重叠！');
// let time1 = new Date((new Date(this.pickedModal.timeRangeList[index - 1].timeRange[0]).getTime() + 1000 * 60 * 1).valueOf());
// let time2 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
// this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
// }
// }
// }
// }
// } else {
// if (this.pickedModal.timeRangeList.length !== 1) {
// //时间段不止一个情况下设置第一个
// let selectTime = new Date(val[0]).valueOf();
// let selectTimeEnd = new Date(val[1]).valueOf();
// let selectTimeAfter = new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).valueOf();
// if (selectTime > selectTimeAfter || selectTimeEnd > selectTimeAfter) {
// this.$message.error('时间不可重叠！');
// let time1 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 2).valueOf());
// let time2 = new Date((new Date(this.pickedModal.timeRangeList[index + 1].timeRange[0]).getTime() - 1000 * 60 * 1).valueOf());
// this.pickedModal.timeRangeList[index].timeRange = [time1, time2];
// }
// }
// }
},
blurLimitTimeSelect(index, val) {
let selectTime = new Date(val[0]).valueOf();
let selectTimeEnd = new Date(val[1]).valueOf();
if (selectTime === selectTimeEnd) {
this.$message.error('时间不可重叠！');
this.pickedModal.timeRangeList[index].timeRange = null;
}
},
submit(pickedModal) {
this.$refs[pickedModal].validate(valid => {
if (valid) {
let params = {
integralMallPickUpPointIdList: this.pickedForm.selectIdList,
settingVo: {
canChooseTime: this.pickedModal.status ? 1 : 0,
delayTimeType: this.pickedModal.status ? this.pickedModal.radio : null,
delayHour: this.pickedModal.timeHours ? Number(this.pickedModal.timeHours) : null,
delayMinute: this.pickedModal.timeMinuter ? Number(this.pickedModal.timeMinuter) : null,
delayDay: this.pickedModal.timeDay ? Number(this.pickedModal.timeDay) : null,
choosenTime: []
}
};
let arrObj = [];
for (let item of this.pickedModal.timeRangeList) {
if (item.timeRange) {
arrObj.push({
start: this.getHours(item.timeRange[0]),
end: this.getHours(item.timeRange[1])
});
}
}
params.settingVo.choosenTime = arrObj;
this.submitLoading = true;
request.post('/api-integral-mall/update-pick-up-points', params).then(res => {
if (res.data.errorCode === 0) {
this.submitLoading = false;
this.pickedForm.dialogVisible = false;
this.$emit('getList');
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
} else {
return false;
}
});
},
//取消
cancelSubmit(pickedModal) {
this.$refs[pickedModal].resetFields();
this.pickedForm.dialogVisible = false;
this.pickedModal.status = false;
this.pickedModal.timeRangeList = this.pickedForm.list;
// 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];
}
}
};
</script>
<style scoped>
.tip-warm {
display: inline-block;
vertical-align: top;
margin-left: 20px;
}
.tip-warm p {
font-size: 12px;
color: rgb(144, 147, 153);
line-height: 18px;
}
.radio-item {
margin-bottom: 22px;
}
.radio-item:last-child {
margin-bottom: 0px;
}
.w-280 {
width: 280px !important;
}
</style>
)
static/css/iconfont.css
......@@ -40,10 +40,6 @@
content: "\e635";
}
.icon-tupian:before {
content: "\e616";
}
.icon-lipin:before {
content: "\e78a";
}
......@@ -56,6 +52,10 @@
content: "\e615";
}
.icon-shezhi:before {
content: "\e663";
}
.icon-xinxixianshi:before {
content: "\e74f";
}
......
static/fonts/iconfont.js
!function(l){var c,e='<svg><symbol id="icon-dingdan" viewBox="0 0 1024 1024"><path d="M955.181146 174.654683c0-2.658678 0-5.112842-0.204513-7.771519-1.636109-45.811065-33.540244-86.10026-78.32874-95.303376-18.815259-3.88576-38.857599-2.863192-58.286399-3.067705-19.224286-0.204514-34.153785 15.54304-33.949271 34.153785 0.204514 18.815259 15.338526 33.540244 34.767326 33.540243 11.248252 0 22.701019-0.204514 33.949271 0 11.043739 0.204514 20.042341 4.703815 26.791292 13.497903 5.930897 7.77152 7.157979 16.565608 7.157979 25.973238v740.748552c0 23.519073-13.90693 37.835031-37.016977 37.835031H173.529858c-22.291991 0-36.607949-14.520471-36.607949-36.812463V172.200519c0-22.087478 14.315958-36.403435 36.198922-36.607949 11.248252 0 22.701019 0.204514 33.949271-0.204513 17.383663-0.613541 31.290593-14.724985 32.108648-32.517676 0.818055-17.179149-11.452766-33.744757-28.427402-34.767325-17.79269-1.227082-35.994408-1.840623-53.582584 0.613541-53.173557 7.567006-88.145396 49.696824-88.34991 103.483922v746.679449c0 58.081885 45.197523 103.279409 102.870381 103.279409h680.826044c14.724985 0 29.245456-2.658678 42.538845-9.203116 40.289195-19.837827 60.331536-52.560016 60.331536-97.348512-0.204514-246.438985-0.204514-493.696026-0.204514-740.953066z m0 0" ></path><path d="M379.066107 204.513681h132.933893c45.811065 0 91.417615 0.409027 137.22868-0.204514 38.244058-0.409027 66.875974-30.268025 67.080487-68.512083 0.204514-21.882964 0-43.765928 0-65.648891 0-40.493709-29.44997-69.943679-70.148192-69.943679H377.429998c-41.10725 0-70.148193 29.040943-70.352706 70.352706v62.172159c0.204514 43.152387 28.836429 71.579788 71.988815 71.784302z m-3.067705-135.797084h272.003196V135.797084h-272.003196V68.716597z m0 0" ></path><path d="M309.940483 545.437987c-2.658678 0-5.112842 0.204514-7.77152 0.613541-14.111444 2.24965-23.723587 10.430198-27.609346 24.132614-3.88576 13.702417-0.409027 25.56421 10.430197 35.176353 7.362493 6.748951 16.565608 8.385061 26.177751 8.385061H710.37827c4.294787 0 8.589575-0.204514 12.679849-0.818055 14.520471-2.454164 26.177751-15.54304 27.200319-30.268024 1.431596-21.473936-13.90693-37.016976-36.812462-37.016977-134.570002-0.204514-268.93549-0.204514-403.505493-0.204513z m0 0M307.690833 784.105452h332.130218c25.768724 0 51.332934 0.204514 77.101657 0 18.815259-0.204514 33.33573-15.134012 33.33573-33.949271 0-19.837827-15.134012-33.949271-36.403435-33.949271H308.304374c-11.248252 0-20.860395 3.88576-27.813861 12.884362-8.589575 11.043739-10.02117 23.31456-4.090273 35.789894 6.339924 12.679848 16.974636 19.224286 31.290593 19.224286z m0 0M307.895347 443.181146c60.331536 0.204514 120.663072 0 180.994607 0h90.395047c16.565608 0 30.063511-10.634711 33.744757-25.973237 5.112842-21.882964-10.634711-41.925305-33.540243-42.129818-45.197523-0.204514-90.395047 0-135.592571 0h-135.59257c-15.54304 0-27.813861 8.589575-32.926703 22.087477-8.589575 22.701019 7.976034 45.811065 32.517676 46.015578z m0 0" ></path></symbol><symbol id="icon-icon-" viewBox="0 0 1024 1024"><path d="M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-960C265.6 64 64 265.6 64 512s201.6 448 448 448 448-201.6 448-448S758.4 64 512 64z" ></path><path d="M512 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M768 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M256 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path></symbol><symbol id="icon-youhuiquan" viewBox="0 0 1024 1024"><path d="M508 479.9c-5.4 0-10.7-2-14.8-6.2L391.4 371.9c-8.2-8.2-8.2-21.5 0-29.7s21.5-8.2 29.7 0L522.9 444c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M508.7 479.9c-5.4 0-10.7-2-14.8-6.2-8.2-8.2-8.2-21.5 0-29.7l101.8-101.8c8.2-8.2 21.5-8.2 29.7 0s8.2 21.5 0 29.7L523.6 473.7c-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M624 514.7H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21zM624 627.2H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21z" fill="" ></path><path d="M514.6 687.9c-11.6 0-21-9.4-21-21V487.4c0-11.6 9.4-21 21-21s21 9.4 21 21v179.5c0 11.6-9.4 21-21 21z" fill="" ></path><path d="M883.8 877H140.2C99.3 877 66 843.7 66 802.8V677.9c0-10 7-18.6 16.8-20.6 68.6-14 118.5-75.1 118.5-145.3S151.4 380.7 82.8 366.7c-9.8-2-16.8-10.6-16.8-20.6V221.2c0-40.9 33.3-74.2 74.2-74.2h743.5c40.9 0 74.2 33.3 74.2 74.2v124.9c0 10-7 18.6-16.8 20.6-68.6 14-118.5 75.1-118.5 145.3s49.8 131.3 118.5 145.3c9.8 2 16.8 10.6 16.8 20.6v124.9c0.1 40.9-33.2 74.2-74.1 74.2zM108 694.2v108.6c0 17.8 14.5 32.2 32.2 32.2h743.5c17.8 0 32.2-14.5 32.2-32.2V694.2c-35.7-10.8-67.8-32.1-91.8-61.1-28-34-43.5-77-43.5-121.1s15.4-87.1 43.5-121.1c24-29 56.1-50.3 91.8-61.1V221.2c0-17.8-14.5-32.2-32.2-32.2H140.2c-17.8 0-32.2 14.5-32.2 32.2v108.6c35.7 10.8 67.8 32.1 91.8 61.1 28 34 43.5 77 43.5 121.1s-15.4 87.1-43.5 121.1c-24 29-56.1 50.3-91.8 61.1z" fill="" ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1089 1024"><path d="M535.744 455.936h-535.68v114.112h535.68V455.936z m489.28 389.952H1.28V960h1023.744v-114.112z m-260.096-145.472V320l260.096 190.208-260.096 190.208zM1025.024 64H2.624v116.096h1022.4V64z" fill="#979797" ></path></symbol><symbol id="icon-shouqi" viewBox="0 0 1088 1024"><path d="M489.536 455.936h535.68v114.112H489.6V455.936zM0.256 845.888H1024V960H0.256v-114.112z m260.096-145.472V320L0.256 510.208l260.096 190.208zM0.256 64h1022.4v116.096H0.256V64z" fill="#979797" ></path></symbol><symbol id="icon-shangpin" viewBox="0 0 1024 1024"><path d="M891.303669 0h-759.406713C59.153786 0 0 59.153786 0 131.896956v760.206088c0 72.743169 59.153786 131.896956 131.896956 131.896956h760.206088c72.743169 0 131.896956-59.153786 131.896956-131.896956V131.896956C1023.200625 59.153786 964.046838 0 891.303669 0zM73.542545 248.605777c18.385636 9.592506 38.370023 14.388759 58.354411 14.388759h760.206088c19.984387 0 39.968774-4.796253 58.354411-14.388759v642.697892c0 31.97502-26.379391 58.354411-58.354411 58.354411H131.896956c-31.97502 0-58.354411-26.379391-58.354411-58.354411V248.605777z 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.35441z" ></path><path d="M224.624512 528.387198c19.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 629.108509 617.117877 707.447307 511.600312 707.447307s-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" ></path></symbol><symbol id="icon-tupian" viewBox="0 0 1024 1024"><path d="M324.3 537.1c-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 901.5c-5.4 0-10.7-2.1-14.8-6.2L344.9 695c-10.2-10.2-26.9-10.2-37.1 0L163.1 839.7c-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 865.7c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.1-14.9 6.1z" ></path><path d="M414 745.7c-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 491.3c-14.6-14.6-38.4-14.6-53.1 0L428.9 739.5c-4.1 4.1-9.5 6.2-14.9 6.2z" ></path><path d="M806 911H218c-57.9 0-105-47.1-105-105V218c0-57.9 47.1-105 105-105h588c57.9 0 105 47.1 105 105v588c0 57.9-47.1 105-105 105zM218 155c-34.7 0-63 28.3-63 63v588c0 34.7 28.3 63 63 63h588c34.7 0 63-28.3 63-63V218c0-34.7-28.3-63-63-63H218z" ></path></symbol><symbol id="icon-lipin" viewBox="0 0 1024 1024"><path d="M867.54211 277.80819h-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 198.11515 389.398196 136.815015 315.83476 118.42518c-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.558319v125.059274c0 30.652114 24.520463 61.299111 55.168484 67.430762V872.39207c0 42.909276 30.652114 73.561389 73.563436 73.56139h300.371068v0.005116h300.377208c42.911322 0 73.558319-30.652114 73.55832-73.562413V580.64645c0-12.259208-0.402159-36.783765-0.40216-36.783765h6.533811c24.520463-6.131651 49.04195-36.779671 49.041949-67.430762V351.36651c0.001023-42.910299-30.652114-73.558319-73.562413-73.55832zM247.995699 171.141822c20.23281-15.017018 38.60832-9.81146 61.918211-3.979638C359.030561 184.312796 393.106658 217.341027 438.500521 257.885442l22.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 454.598662v-91.212398c0-17.655102 17.649985-35.305087 35.305087-35.305087h313.856197v161.823596H172.273087c-23.539112 0-35.305087-17.649985-35.305087-35.306111zM486.92337 894.467855H220.53937c-22.733771 0-34.099632-11.368932-34.099632-34.102703V577.957201c0-17.052374 17.052374-34.104749 34.104749-34.104749H486.92337v350.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.4752v-350.615403h261.4752c17.056468 0 34.102702 17.056468 34.102703 34.104749v282.407951z m47.049572-405.030733c0 17.897625-17.897625 35.800367-35.795251 35.800368H540.282648V326.85014h308.529889c17.892509 0 35.795251 17.902742 35.795251 35.802414v92.681865z" ></path></symbol><symbol id="icon-icon_yunxiazai" viewBox="0 0 1024 1024"><path d="M790.528 409.6c-18.432-141.824-136.704-252.416-278.528-252.416S251.904 267.264 233.472 409.6C117.76 417.28 25.6 517.12 25.6 637.952c0 125.952 99.84 228.864 220.672 228.864h533.504c120.832-2.56 218.112-102.4 218.112-228.864C998.4 517.12 906.24 417.28 790.528 409.6z m-286.208 389.12l-194.56-223.232h131.584V367.616h125.952v207.872h131.584l-194.56 223.232z" fill="" ></path></symbol><symbol id="icon-daifahuo" viewBox="0 0 1024 1024"><path d="M329.318 571.167c15.114 0 27.361-12.268 27.361-27.341V393.851c0-15.114-12.247-27.361-27.361-27.361s-27.341 12.247-27.341 27.361v122.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 681.165c-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 920.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.16z" ></path><path d="M1003.418 144.814c-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.12v93.614l-222.72 117.76c-51.589 22.303-58.88 87.06-59.167 89.825a26.218 26.218 0 0 0-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 0 2.335-1.085l238.305-125.993a27.361 27.361 0 0 0 14.561-24.207V146.842c0-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.724v680.12c0 15.094 12.227 27.341 27.341 27.341s27.402-12.206 27.402-27.3V146.843a33.572 33.572 0 0 0-0.102-2.028z" ></path></symbol><symbol id="icon-xinxixianshi" viewBox="0 0 1024 1024"><path d="M486.4 418.304h68.096V768H486.4V418.304z" fill="" ></path><path d="M512 938.496c239.104 0 426.496-187.904 426.496-426.496S751.104 85.504 512 85.504 85.504 272.896 85.504 512s187.392 426.496 426.496 426.496z m0 85.504C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z" fill="" ></path><path d="M520.704 327.68m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z" fill="" ></path></symbol></svg>',t=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(t&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(e=c,h=l.document,i=!1,a=function(){i||(i=!0,e())},(o=function(){try{h.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}a()})(),h.onreadystatechange=function(){"complete"==h.readyState&&(h.onreadystatechange=null,a())});var e,h,i,a,o}(function(){var c,t;(c=document.createElement("div")).innerHTML=e,e=null,(t=c.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",function(c,t){t.firstChild?function(c,t){t.parentNode.insertBefore(c,t)}(c,t.firstChild):t.appendChild(c)}(t,document.body))})}(window);
\ No newline at end of file
!function(n){var c,a='<svg><symbol id="icon-dingdan" viewBox="0 0 1024 1024"><path d="M955.181146 174.654683c0-2.658678 0-5.112842-0.204513-7.771519-1.636109-45.811065-33.540244-86.10026-78.32874-95.303376-18.815259-3.88576-38.857599-2.863192-58.286399-3.067705-19.224286-0.204514-34.153785 15.54304-33.949271 34.153785 0.204514 18.815259 15.338526 33.540244 34.767326 33.540243 11.248252 0 22.701019-0.204514 33.949271 0 11.043739 0.204514 20.042341 4.703815 26.791292 13.497903 5.930897 7.77152 7.157979 16.565608 7.157979 25.973238v740.748552c0 23.519073-13.90693 37.835031-37.016977 37.835031H173.529858c-22.291991 0-36.607949-14.520471-36.607949-36.812463V172.200519c0-22.087478 14.315958-36.403435 36.198922-36.607949 11.248252 0 22.701019 0.204514 33.949271-0.204513 17.383663-0.613541 31.290593-14.724985 32.108648-32.517676 0.818055-17.179149-11.452766-33.744757-28.427402-34.767325-17.79269-1.227082-35.994408-1.840623-53.582584 0.613541-53.173557 7.567006-88.145396 49.696824-88.34991 103.483922v746.679449c0 58.081885 45.197523 103.279409 102.870381 103.279409h680.826044c14.724985 0 29.245456-2.658678 42.538845-9.203116 40.289195-19.837827 60.331536-52.560016 60.331536-97.348512-0.204514-246.438985-0.204514-493.696026-0.204514-740.953066z m0 0" ></path><path d="M379.066107 204.513681h132.933893c45.811065 0 91.417615 0.409027 137.22868-0.204514 38.244058-0.409027 66.875974-30.268025 67.080487-68.512083 0.204514-21.882964 0-43.765928 0-65.648891 0-40.493709-29.44997-69.943679-70.148192-69.943679H377.429998c-41.10725 0-70.148193 29.040943-70.352706 70.352706v62.172159c0.204514 43.152387 28.836429 71.579788 71.988815 71.784302z m-3.067705-135.797084h272.003196V135.797084h-272.003196V68.716597z m0 0" ></path><path d="M309.940483 545.437987c-2.658678 0-5.112842 0.204514-7.77152 0.613541-14.111444 2.24965-23.723587 10.430198-27.609346 24.132614-3.88576 13.702417-0.409027 25.56421 10.430197 35.176353 7.362493 6.748951 16.565608 8.385061 26.177751 8.385061H710.37827c4.294787 0 8.589575-0.204514 12.679849-0.818055 14.520471-2.454164 26.177751-15.54304 27.200319-30.268024 1.431596-21.473936-13.90693-37.016976-36.812462-37.016977-134.570002-0.204514-268.93549-0.204514-403.505493-0.204513z m0 0M307.690833 784.105452h332.130218c25.768724 0 51.332934 0.204514 77.101657 0 18.815259-0.204514 33.33573-15.134012 33.33573-33.949271 0-19.837827-15.134012-33.949271-36.403435-33.949271H308.304374c-11.248252 0-20.860395 3.88576-27.813861 12.884362-8.589575 11.043739-10.02117 23.31456-4.090273 35.789894 6.339924 12.679848 16.974636 19.224286 31.290593 19.224286z m0 0M307.895347 443.181146c60.331536 0.204514 120.663072 0 180.994607 0h90.395047c16.565608 0 30.063511-10.634711 33.744757-25.973237 5.112842-21.882964-10.634711-41.925305-33.540243-42.129818-45.197523-0.204514-90.395047 0-135.592571 0h-135.59257c-15.54304 0-27.813861 8.589575-32.926703 22.087477-8.589575 22.701019 7.976034 45.811065 32.517676 46.015578z m0 0" ></path></symbol><symbol id="icon-icon-" viewBox="0 0 1024 1024"><path d="M512 1024C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z m0-960C265.6 64 64 265.6 64 512s201.6 448 448 448 448-201.6 448-448S758.4 64 512 64z" ></path><path d="M512 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M768 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path><path d="M256 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z" ></path></symbol><symbol id="icon-youhuiquan" viewBox="0 0 1024 1024"><path d="M508 479.9c-5.4 0-10.7-2-14.8-6.2L391.4 371.9c-8.2-8.2-8.2-21.5 0-29.7s21.5-8.2 29.7 0L522.9 444c8.2 8.2 8.2 21.5 0 29.7-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M508.7 479.9c-5.4 0-10.7-2-14.8-6.2-8.2-8.2-8.2-21.5 0-29.7l101.8-101.8c8.2-8.2 21.5-8.2 29.7 0s8.2 21.5 0 29.7L523.6 473.7c-4.1 4.1-9.5 6.2-14.9 6.2z" fill="" ></path><path d="M624 514.7H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21zM624 627.2H400c-11.6 0-21-9.4-21-21s9.4-21 21-21h224c11.6 0 21 9.4 21 21s-9.4 21-21 21z" fill="" ></path><path d="M514.6 687.9c-11.6 0-21-9.4-21-21V487.4c0-11.6 9.4-21 21-21s21 9.4 21 21v179.5c0 11.6-9.4 21-21 21z" fill="" ></path><path d="M883.8 877H140.2C99.3 877 66 843.7 66 802.8V677.9c0-10 7-18.6 16.8-20.6 68.6-14 118.5-75.1 118.5-145.3S151.4 380.7 82.8 366.7c-9.8-2-16.8-10.6-16.8-20.6V221.2c0-40.9 33.3-74.2 74.2-74.2h743.5c40.9 0 74.2 33.3 74.2 74.2v124.9c0 10-7 18.6-16.8 20.6-68.6 14-118.5 75.1-118.5 145.3s49.8 131.3 118.5 145.3c9.8 2 16.8 10.6 16.8 20.6v124.9c0.1 40.9-33.2 74.2-74.1 74.2zM108 694.2v108.6c0 17.8 14.5 32.2 32.2 32.2h743.5c17.8 0 32.2-14.5 32.2-32.2V694.2c-35.7-10.8-67.8-32.1-91.8-61.1-28-34-43.5-77-43.5-121.1s15.4-87.1 43.5-121.1c24-29 56.1-50.3 91.8-61.1V221.2c0-17.8-14.5-32.2-32.2-32.2H140.2c-17.8 0-32.2 14.5-32.2 32.2v108.6c35.7 10.8 67.8 32.1 91.8 61.1 28 34 43.5 77 43.5 121.1s-15.4 87.1-43.5 121.1c-24 29-56.1 50.3-91.8 61.1z" fill="" ></path></symbol><symbol id="icon-zhankai" viewBox="0 0 1089 1024"><path d="M535.744 455.936h-535.68v114.112h535.68V455.936z m489.28 389.952H1.28V960h1023.744v-114.112z m-260.096-145.472V320l260.096 190.208-260.096 190.208zM1025.024 64H2.624v116.096h1022.4V64z" fill="#979797" ></path></symbol><symbol id="icon-shouqi" viewBox="0 0 1088 1024"><path d="M489.536 455.936h535.68v114.112H489.6V455.936zM0.256 845.888H1024V960H0.256v-114.112z m260.096-145.472V320L0.256 510.208l260.096 190.208zM0.256 64h1022.4v116.096H0.256V64z" fill="#979797" ></path></symbol><symbol id="icon-shangpin" viewBox="0 0 1024 1024"><path d="M891.303669 0h-759.406713C59.153786 0 0 59.153786 0 131.896956v760.206088c0 72.743169 59.153786 131.896956 131.896956 131.896956h760.206088c72.743169 0 131.896956-59.153786 131.896956-131.896956V131.896956C1023.200625 59.153786 964.046838 0 891.303669 0zM73.542545 248.605777c18.385636 9.592506 38.370023 14.388759 58.354411 14.388759h760.206088c19.984387 0 39.968774-4.796253 58.354411-14.388759v642.697892c0 31.97502-26.379391 58.354411-58.354411 58.354411H131.896956c-31.97502 0-58.354411-26.379391-58.354411-58.354411V248.605777z 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.35441z" ></path><path d="M224.624512 528.387198c19.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 629.108509 617.117877 707.447307 511.600312 707.447307s-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" ></path></symbol><symbol id="icon-lipin" viewBox="0 0 1024 1024"><path d="M867.54211 277.80819h-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 198.11515 389.398196 136.815015 315.83476 118.42518c-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.558319v125.059274c0 30.652114 24.520463 61.299111 55.168484 67.430762V872.39207c0 42.909276 30.652114 73.561389 73.563436 73.56139h300.371068v0.005116h300.377208c42.911322 0 73.558319-30.652114 73.55832-73.562413V580.64645c0-12.259208-0.402159-36.783765-0.40216-36.783765h6.533811c24.520463-6.131651 49.04195-36.779671 49.041949-67.430762V351.36651c0.001023-42.910299-30.652114-73.558319-73.562413-73.55832zM247.995699 171.141822c20.23281-15.017018 38.60832-9.81146 61.918211-3.979638C359.030561 184.312796 393.106658 217.341027 438.500521 257.885442l22.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 454.598662v-91.212398c0-17.655102 17.649985-35.305087 35.305087-35.305087h313.856197v161.823596H172.273087c-23.539112 0-35.305087-17.649985-35.305087-35.306111zM486.92337 894.467855H220.53937c-22.733771 0-34.099632-11.368932-34.099632-34.102703V577.957201c0-17.052374 17.052374-34.104749 34.104749-34.104749H486.92337v350.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.4752v-350.615403h261.4752c17.056468 0 34.102702 17.056468 34.102703 34.104749v282.407951z m47.049572-405.030733c0 17.897625-17.897625 35.800367-35.795251 35.800368H540.282648V326.85014h308.529889c17.892509 0 35.795251 17.902742 35.795251 35.802414v92.681865z" ></path></symbol><symbol id="icon-icon_yunxiazai" viewBox="0 0 1024 1024"><path d="M790.528 409.6c-18.432-141.824-136.704-252.416-278.528-252.416S251.904 267.264 233.472 409.6C117.76 417.28 25.6 517.12 25.6 637.952c0 125.952 99.84 228.864 220.672 228.864h533.504c120.832-2.56 218.112-102.4 218.112-228.864C998.4 517.12 906.24 417.28 790.528 409.6z m-286.208 389.12l-194.56-223.232h131.584V367.616h125.952v207.872h131.584l-194.56 223.232z" fill="" ></path></symbol><symbol id="icon-daifahuo" viewBox="0 0 1024 1024"><path d="M329.318 571.167c15.114 0 27.361-12.268 27.361-27.341V393.851c0-15.114-12.247-27.361-27.361-27.361s-27.341 12.247-27.341 27.361v122.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 681.165c-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 920.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.16z" ></path><path d="M1003.418 144.814c-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.12v93.614l-222.72 117.76c-51.589 22.303-58.88 87.06-59.167 89.825a26.218 26.218 0 0 0-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 0 2.335-1.085l238.305-125.993a27.361 27.361 0 0 0 14.561-24.207V146.842c0-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.724v680.12c0 15.094 12.227 27.341 27.341 27.341s27.402-12.206 27.402-27.3V146.843a33.572 33.572 0 0 0-0.102-2.028z" ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M245.921684 862.315789a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894737H454.709895a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 1 1 0-53.894737h138.13221z m377.263158-377.263157a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894736h-84.237473a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 1 1 0-53.894736h515.395368z m-377.263158-377.263158a107.789474 107.789474 0 0 1 208.788211 0H916.210526a26.947368 26.947368 0 1 1 0 53.894737H454.709895a107.789474 107.789474 0 0 1-208.788211 0H107.789474a26.947368 26.947368 0 0 1 0-53.894737h138.13221zM350.315789 188.631579a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z m377.263158 377.263158a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z m-377.263158 377.263158a53.894737 53.894737 0 1 0 0-107.789474 53.894737 53.894737 0 0 0 0 107.789474z" ></path></symbol><symbol id="icon-xinxixianshi" viewBox="0 0 1024 1024"><path d="M486.4 418.304h68.096V768H486.4V418.304z" fill="" ></path><path d="M512 938.496c239.104 0 426.496-187.904 426.496-426.496S751.104 85.504 512 85.504 85.504 272.896 85.504 512s187.392 426.496 426.496 426.496z m0 85.504C230.4 1024 0 793.6 0 512S230.4 0 512 0s512 230.4 512 512-230.4 512-512 512z" fill="" ></path><path d="M520.704 327.68m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z" fill="" ></path></symbol></svg>',t=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(t&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var t=function(){document.removeEventListener("DOMContentLoaded",t,!1),c()};document.addEventListener("DOMContentLoaded",t,!1)}else document.attachEvent&&(a=c,e=n.document,h=!1,i=function(){h||(h=!0,a())},(o=function(){try{e.documentElement.doScroll("left")}catch(c){return void setTimeout(o,50)}i()})(),e.onreadystatechange=function(){"complete"==e.readyState&&(e.onreadystatechange=null,i())});var a,e,h,i,o}(function(){var c,t;(c=document.createElement("div")).innerHTML=a,a=null,(t=c.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",function(c,t){t.firstChild?function(c,t){t.parentNode.insertBefore(c,t)}(c,t.firstChild):t.appendChild(c)}(t,document.body))})}(window);
\ No newline at end of file
static/fonts/iconfont.svg
......@@ -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="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" />
......@@ -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="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" />
......
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