合并master

2021-05-19 09:51:27 +08:00 · 2021-05-19 09:51:27 +08:00 · e359e674cf
parent 3efefc4c02 95d0d4032f
commit e359e674cf
47 changed files with 151 additions and 7494 deletions
--- a/buyer/src/assets/iconfont/icomoon.eot
+++ b/buyer/src/assets/iconfont/icomoon.eot
--- a/buyer/src/assets/iconfont/icomoon.svg
+++ b/buyer/src/assets/iconfont/icomoon.svg
@ -0,0 +1,14 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="1024">
+<font-face units-per-em="1024" ascent="960" descent="-64" />
+<missing-glyph horiz-adv-x="1024" />
+<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
+<glyph unicode="&#xe900;" glyph-name="customer-service" d="M870.1 397.6v25.5c2 116.5-32.2 214.5-99.6 284-32.2 33.2-71 58.2-116 75.6-7.2 62.8-74.6 112.4-156.8 112.4s-150.2-49.5-156.8-112.4c-45-17.4-83.8-42.4-116-75.6-67.4-69.5-101.7-167-99.6-283.5v-31.2c-17.4-17.9-31.2-44.4-20.9-82.2 7.7-28.1 28.1-48.5 53.1-57.7 12.8-8.2 27.6-12.8 43.9-12.8 32.2-141 148.1-237 299.9-237 151.7 0 267.7 96 299.9 237.5 1 0 2-0.5 3.1-0.5 19.9 0 38.3 7.2 53.1 18.9 18.9 10.7 33.7 29.1 39.8 52.1 10.7 41-7.2 69.1-27.1 86.9zM781.2 320.5c0-18.9-1.5-36.8-4.1-54.1-49.5-79.7-131.3-131.8-232.9-143-7.7 10.2-23 16.9-40.9 16.9-25.5 0-46-13.8-46-31.2 0-16.9 20.4-31.2 46-31.2 23 0 41.4 11.2 45.5 26.1 32.7 3.6 63.9 11.7 93.5 23.5 41.9 16.9 78.7 41.9 109.8 73.6 5.1 5.1 9.7 10.2 14.3 15.8-36.8-113-135.4-185.5-263.6-185.5h-1c-165 0-279.9 119-279.9 289.1l-0.5 16.3c0 7.2 1 26.6 2 45 68.5 25 130.3 120.6 155.3 164.5 23-31.2 75.6-91.4 156.3-122.6 30.1-11.7 60.8-17.9 90.9-24.5 59.8-12.8 116.5-25 154.8-75.1l1.5-1.5-1-2.1z" />
+<glyph unicode="&#xe901;" glyph-name="next" horiz-adv-x="1025" d="M1024.951 448c0 2.706-1.097 5.193-1.536 7.826-0.585 3.145-0.658 6.363-1.902 9.362l-0.146 0.366c-1.682 3.95-4.389 7.314-7.022 10.606-1.024 1.317-1.463 2.926-2.706 4.096 0 0-0.146 0-0.146 0.146l-241.591 240.274c-8.15 7.642-19.145 12.336-31.236 12.336-25.247 0-45.714-20.467-45.714-45.714 0-12.218 4.793-23.317 12.602-31.518l-0.018 0.019 162.889-162.085h-821.76c-25.247 0-45.714-20.467-45.714-45.714s20.467-45.714 45.714-45.714h821.76l-162.889-162.085c-8.921-8.364-14.479-20.222-14.479-33.379 0-25.247 20.467-45.714 45.714-45.714 13.029 0 24.785 5.451 33.112 14.196l0.018 0.019 241.737 240.421c1.17 1.243 1.682 2.779 2.706 4.096 2.633 3.291 5.339 6.583 7.022 10.606l0.146 0.366c1.243 2.926 1.317 6.217 1.902 9.362 0.439 2.633 1.463 5.12 1.463 7.753v0.073c0 0.073 0 0 0 0z" />
+<glyph unicode="&#xe902;" glyph-name="qq" d="M512 929.009c-265.653 0-480.989-215.345-480.989-481.012 0-265.662 215.335-481.006 480.989-481.006s480.989 215.345 480.989 481.006c-0.001 265.668-215.335 481.012-480.989 481.012v0zM776.822 298.086c-12.422-11.596-33.749 1.033-54.249 29.4-8.901-24.019-20.497-46.171-33.956-66.051 28.987-10.353 47.626-26.505 47.626-44.726 0-31.473-55.699-56.942-124.443-56.942-40.79 0-76.819 8.899-99.593 22.777-22.565-13.877-58.799-22.777-99.59-22.777-68.745 0-124.443 25.469-124.443 56.942 0 18.014 18.637 34.373 47.626 44.726-13.666 19.877-25.056 42.033-33.959 66.051-20.496-28.156-41.822-40.997-54.249-29.4-16.978 15.94-10.555 72.263 14.702 125.688 5.799 12.215 12.010 23.188 18.428 32.716 3.518 155.297 105.805 279.947 231.281 279.947h0.413c125.475 0 227.762-124.443 231.281-279.947 6.417-9.527 12.634-20.501 18.427-32.716 25.055-53.425 31.684-109.748 14.701-125.688v0z" />
+<glyph unicode="&#xe903;" glyph-name="wechat" d="M579.6 448.4c-11.7 0-23.4-10.8-23.4-24.2 0-10.8 11.7-21.7 23.4-21.7 17.5 0 30 10.8 30 21.7 0 13.4-12.5 24.2-30 24.2zM502.8 561c18.4 0 30 11.7 30 29.2 0 18.4-11.7 29.2-30 29.2-17.5 0-34.2-10.8-34.2-29.2 0-17.5 16.7-29.2 34.2-29.2zM512 960c-282.8 0-512-229.2-512-512s229.2-512 512-512 512 229.2 512 512-229.2 512-512 512zM415.2 318.3c-30.9 0-53.4 5-82.6 13.3l-84.3-42.5 24.2 71.7c-59.2 41.7-94.3 94.3-94.3 158.5 0 113.5 106.8 200.2 236.9 200.2 115.1 0 217.7-68.4 237.7-165.2-8.3 1.7-15.9 2.5-22.5 2.5-113.5 0-201-85.1-201-187.7 0-17.5 2.5-33.4 6.7-50.1-6.6-0.7-14.1-0.7-20.8-0.7zM763.1 236.5l16.7-60.1-63.4 35.9c-24.2-5-47.5-12.5-71.7-12.5-111.8 0-200.2 76.7-200.2 171.8s88.4 171.8 200.2 171.8c105.9 0 201-76.7 201-171.8 0-53.3-35.9-100.9-82.6-135.1zM337.7 619.4c-17.5 0-35.9-10.8-35.9-29.2 0-17.5 18.4-29.2 35.9-29.2 16.7 0 30 11.7 30 29.2 0 18.4-13.4 29.2-30 29.2zM710.5 448.4c-12.5 0-23.4-10.8-23.4-24.2 0-10.8 10.8-21.7 23.4-21.7 16.7 0 29.2 10.8 29.2 21.7 0 13.4-12.5 24.2-29.2 24.2z" />
+</font></defs></svg>
--- a/buyer/src/assets/iconfont/icomoon.ttf
+++ b/buyer/src/assets/iconfont/icomoon.ttf
--- a/buyer/src/assets/iconfont/icomoon.woff
+++ b/buyer/src/assets/iconfont/icomoon.woff
--- a/buyer/src/assets/iconfont/iconfont.css
+++ b/buyer/src/assets/iconfont/iconfont.css
@ -1,41 +1,39 @@
-@font-face {font-family: "iconfont";
-  src: url('iconfont.eot?t=1608105836276'); /* IE9 */
-  src: url('iconfont.eot?t=1608105836276#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAdMAAsAAAAADPQAAAb9AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDVgqMUIodATYCJAMcCxAABCAFhG0HWRvmCsiOkUtOluX/f0k8/LOfu+9PRBKZs9KQTCTiSURCgdOJVgN9AiXs+HfTeyS0aaCioU7FjYpvyLyI1mDmsHm7OQtTozMxZGL+ZQfHUj+twfK+7V0qAyvx6fkpajywyKYfbfi8CQ1wyFtgZ1s+k3Q5ARQFiYeWeXV8IOAEdUDBvkYlAcJlgceQA6F3CDk0DegdmIhkJuMqgDf95+MfUoMASDBTIOy6tlchh+IxfHDB9P+fYYCKAGl5LjBHgRQwAtIgHkM91zBTNdI1ZNjv4OqAMgIDPkavy14Pff36g8v//4zBpRBygc1FTIMMLJe0P/+8yAKpKQN2PZsFY5D5ZMAY8UmBcRmfBIyH8kmD8WuXMLdSkKwWDzksrwIDkCRo/QQBN6JJzeJCMQhRSUSkE5tydyKRZ0V0PIpmk95u7FDKZ6zlJd/6SmB/I7K9FmqMG/2WR28ww2IL2XU+cv1Z9b1sfoYtUT1Bi9f70PakZZTdLkJWq2CR7zarFxraZdQvYnWbDLRQWdm1Xr+hf1Hl6q79kXzRYVtQBhF1OE1aLHy9r1GS0pC+nrTZhEHu5RZlJlFmx0ZJWWclVcbFXsYVvuZ93vvscaYjcYdtlg67KIMovwhE2XaXbrakrz97/nCPnzftQyOaEvc2LaOO2CP2WauX7fFnIxYi5SRtYrEAlCQ8+tlSbBWMRXZbr9vClTbeWUuApfimRQDG5b5LzBEbWEXejdUdtyl42Xa+nnPSwl9Kdm3Wm1ndm6gLeVeKTFTF4kav4RN8xZ5ktlZv2FdRWYK311gD7eMjmYR00pC3wG19hl0i3PnGxUvMGzZRIspEoVD+ZGRQGTeDfgOrewsy0FlGL6O3t4ky0CLa53L5Xkv0UWuO+VxWN+uAPe6Ejb/4YnjXdT+aWnbiwrkY85pBff4wm23gVkv5+vD087bc67Y0u2jTBTOHo4eonwNRB7YFGBd5X7IK6Y00bTCxkOlczKIVHKOR9KGLUQkMJHlae+Fxm1cXvdREmawFt7iY5Aru6opfEYWqSGm1T0eMMN14eadAON2ZqAjOCI7zI/OCMsxzc5xNwvozP29Mv+rIizGswEcalrcwQBz068w2xDjyjgIsPZFXPa+Szn88//TVufz3/xdQ6F/kM+cezuXi90ShKlIU9iJzx1FCHj+WU3k9ucGVIZyqlaE+aHJft+rTpBBpW1GDn2peUxP7R5SnhwBpWxjVjCqtWADNhm6YZyMSyq/KXQb5t/j/93dR95APPR+S7CpfhQ3E6tTbcUnDnqZ+uule5rduo4uPfFCIGhs9LbQZBqaP//17nFTitBU/bi+fDo7KCvh+3Scasz/flbcN71rIcGuMIphMJ7/4R48Dq1x0XDnlfo3iuwR2524O3JzHFDmVVu8P3J+7APNrCWoKEHAhc7PBF4lS53qiUl+tsPDpU1FhS5nvt7CUuSBcuPq2jX80Mp/j27Zy4hAYCr42pw0L7vVkYYefujAwp3ZEdR1xMsBzvt98T48Jucxdb7+MFPkLZkrFgB4YpuXI4BpQ0UuTRtRXXlRfll9oDLoDSHFDj3Mw8Fr2/Pb1QXhP+LU1azKSl0QuSc4wbrdYqYYRlzO+fg0r9wIsjwH4CH8qc2G7OLv1hj/zr2CyCMJulmQyVGMb7v7mT91dF/glg2hecea/mzNbxvO9t8mxn073ijgZjjcGxI+Xb4/jMTz8cwasxV5GqvRB72T/4ZLwk1LvnuaAloP5o8flajIuO/mQZGr6mOSQc/Pr2+94cGoKL8/c//WI+xEnaBryRi3oS212LDbM5vCGZFNmAjOsIFjVWW4NrGSnw2iLXiJ1vewAgwDmK7FnmBRgfhw7jZUCzHGnmVgxAOlgrAyTXq+bwWtRyJcW1/xfBOsWHvj9/7Rdr5rrcYTpAY5HLaSWXp3WNCpN8ZUL1lz63UHWho5UI4cGAhzhJkWxB1yVgabH5ek6qaUPAJ23DQlHgZBCCEemsfGQwZIOWYQiKIpTeXSJpyEwKO0EYNFUAhA3O4DBxQnAuLmGxLGPgMnHJ3DgFhiQhOF5SpbI0JBlQxSSYQo5Vzqaq5FpO5WSfRhpFPZSqIa3S4Y45TpFqBgyVBPnpiQme/OVik7FkDL2GDpClTpsmJKrHKLt4PKIqyna27Vc3RBtq0I2LFE9bJguNylJGbZnokzbAaQyQyhIDFM55bikRgtqyGh1UvYfhvR9fy8KKsO1kxgS0/ETFlLYuxoNrJ4rRaLkFMhKTWeqjm0pH2oElVTD0KXEleuH0OrAxUOXQruY0eLShW/USkFmmETqHCmdXEnYTZlWk1i/rmM5T0CR8Eq5YCAM4YiJHJAjIoBxMthhpEIzStNJjFFrlMOlEi3eptDLHUdpJKM10uHMiLBUCwAAAAA=') format('woff2'),
-  url('iconfont.woff?t=1608105836276') format('woff'),
-  url('iconfont.ttf?t=1608105836276') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('iconfont.svg?t=1608105836276#iconfont') format('svg'); /* iOS 4.1- */
+@font-face {
+  font-family: 'icomoon';
+  src:  url('icomoon.eot?4ejtdc');
+  src:  url('icomoon.eot?4ejtdc#iefix') format('embedded-opentype'),
+    url('icomoon.ttf?4ejtdc') format('truetype'),
+    url('icomoon.woff?4ejtdc') format('woff'),
+    url('icomoon.svg?4ejtdc#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
 }

-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'icomoon' !important;
+  speak: never;
  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-customer-service:before {
+  content: "\e900";
+}
+.icon-next:before {
+  content: "\e901";
+}
 .icon-qq:before {
-  content: "\e6e6";
+  content: "\e902";
 }
-
-.icon-weixin:before {
-  content: "\e643";
+.icon-wechat:before {
+  content: "\e903";
 }
-
-.icon-zhifubao:before {
-  content: "\e601";
-}
-
-.icon-kefu:before {
-  content: "\e673";
-}
-
-.icon-xiayibu:before {
-  content: "\e600";
-}
-
-.icon-weibo:before {
-  content: "\eb0e";
-}
-
--- a/buyer/src/assets/iconfont/iconfont.eot
+++ b/buyer/src/assets/iconfont/iconfont.eot
--- a/buyer/src/assets/iconfont/iconfont.js
+++ b/buyer/src/assets/iconfont/iconfont.js
--- a/buyer/src/assets/iconfont/iconfont.json
+++ b/buyer/src/assets/iconfont/iconfont.json
@ -1,51 +0,0 @@
-{
-  "id": "2274088",
-  "name": "lili shop",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "829012",
-      "name": "QQ",
-      "font_class": "qq",
-      "unicode": "e6e6",
-      "unicode_decimal": 59110
-    },
-    {
-      "icon_id": "2450774",
-      "name": "微信",
-      "font_class": "weixin",
-      "unicode": "e643",
-      "unicode_decimal": 58947
-    },
-    {
-      "icon_id": "7010369",
-      "name": "支付宝",
-      "font_class": "zhifubao",
-      "unicode": "e601",
-      "unicode_decimal": 58881
-    },
-    {
-      "icon_id": "10615183",
-      "name": "服务评价-客服",
-      "font_class": "kefu",
-      "unicode": "e673",
-      "unicode_decimal": 58995
-    },
-    {
-      "icon_id": "13090705",
-      "name": "下一步",
-      "font_class": "xiayibu",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    },
-    {
-      "icon_id": "14510226",
-      "name": "微博",
-      "font_class": "weibo",
-      "unicode": "eb0e",
-      "unicode_decimal": 60174
-    }
-  ]
-}
--- a/buyer/src/assets/iconfont/iconfont.svg
+++ b/buyer/src/assets/iconfont/iconfont.svg
@ -1,44 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<!--
-2013-9-30: Created.
-->
-<svg>
-<metadata>
-Created by iconfont
-</metadata>
-<defs>
-
-<font id="iconfont" horiz-adv-x="1024" >
-  <font-face
-    font-family="iconfont"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    ascent="896"
-    descent="-128"
-  />
-    <missing-glyph />
-    
-    <glyph glyph-name="qq" unicode="&#59110;" d="M512 865.009172c-265.653359 0-480.988706-215.344556-480.988706-481.012242 0-265.661545 215.335347-481.006102 480.988706-481.006102s480.988706 215.344556 480.988706 481.006102C992.987682 649.664615 777.653359 865.009172 512 865.009172L512 865.009172zM776.822434 234.085642c-12.421914-11.596106-33.748638 1.032516-54.248531 29.399587-8.900717-24.019043-20.496823-46.170552-33.95637-66.051345 28.987195-10.352789 47.625694-26.504654 47.625694-44.725644 0-31.472805-55.698556-56.941873-124.443243-56.941873-40.790008 0-76.818573 8.898671-99.593276 22.776749-22.564925-13.877055-58.799174-22.776749-99.590206-22.776749-68.744687 0-124.443243 25.469068-124.443243 56.941873 0 18.014282 18.637476 34.372855 47.625694 44.725644-13.666254 19.8767-25.055652 42.033325-33.95944 66.051345-20.4958-28.15627-41.821501-40.996716-54.248531-29.399587-16.977673 15.940041-10.555403 72.262814 14.70184 125.687584 5.799076 12.215206 12.009522 23.188118 18.427698 32.716122 3.518127 155.296949 105.804744 279.9469 231.280504 279.9469l0.413416 0c125.474736 0 227.762377-124.443243 231.280504-279.9469 6.417153-9.526981 12.633738-20.500916 18.426675-32.716122C787.176247 306.348456 793.805224 250.025683 776.822434 234.085642L776.822434 234.085642zM776.822434 234.085642"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="weixin" unicode="&#58947;" d="M579.6 384.4c-11.7 0-23.4-10.8-23.4-24.2 0-10.8 11.7-21.7 23.4-21.7 17.5 0 30 10.8 30 21.7 0 13.4-12.5 24.2-30 24.2M502.8 497c18.4 0 30 11.7 30 29.2 0 18.4-11.7 29.2-30 29.2-17.5 0-34.2-10.8-34.2-29.2 0-17.5 16.7-29.2 34.2-29.2M512 896C229.2 896 0 666.8 0 384s229.2-512 512-512 512 229.2 512 512S794.8 896 512 896m-96.8-641.7c-30.9 0-53.4 5-82.6 13.3l-84.3-42.5 24.2 71.7c-59.2 41.7-94.3 94.3-94.3 158.5 0 113.5 106.8 200.2 236.9 200.2 115.1 0 217.7-68.4 237.7-165.2-8.3 1.7-15.9 2.5-22.5 2.5-113.5 0-201-85.1-201-187.7 0-17.5 2.5-33.4 6.7-50.1-6.6-0.7-14.1-0.7-20.8-0.7m347.9-81.8l16.7-60.1-63.4 35.9c-24.2-5-47.5-12.5-71.7-12.5-111.8 0-200.2 76.7-200.2 171.8s88.4 171.8 200.2 171.8c105.9 0 201-76.7 201-171.8 0-53.3-35.9-100.9-82.6-135.1M337.7 555.4c-17.5 0-35.9-10.8-35.9-29.2 0-17.5 18.4-29.2 35.9-29.2 16.7 0 30 11.7 30 29.2 0 18.4-13.4 29.2-30 29.2m372.8-171c-12.5 0-23.4-10.8-23.4-24.2 0-10.8 10.8-21.7 23.4-21.7 16.7 0 29.2 10.8 29.2 21.7 0 13.4-12.5 24.2-29.2 24.2m0 0z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="zhifubao" unicode="&#58881;" d="M264.504 327.279c-10.624-8.55-22.01-21.032-25.317-36.9-4.5-21.68-0.94-48.815 19.975-70.103 25.338-25.806 63.842-32.869 80.473-34.083 45.176-3.267 93.326 19.136 129.619 44.687 14.224 10.038 38.583 30.19 61.866 61.279-52.18 26.94-117.314 56.74-186.946 53.824-35.57-1.487-61.044-8.863-79.67-18.704z m661.692-119.131C949.223 262.206 962 321.626 962 384c0 248.126-201.854 450-450 450S62 632.126 62 384c0-248.146 201.854-450 450-450 149.752 0 282.56 73.585 364.422 186.437-77.341 38.445-204.81 101.72-283.324 140.009-37.468-42.711-92.857-85.52-155.426-104.146-39.307-11.68-74.74-16.141-111.796-8.57-36.685 7.514-63.704 24.692-79.454 41.91-8.022 8.784-17.237 19.956-23.91 33.24a62.622 62.622 0 0 1 1.057-2.68s-3.834 6.613-6.769 17.139a75.58 75.58 0 0 0-2.936 15.946 82.193 82.193 0 0 0-0.175 11.465c-0.333 6.77-0.058 13.872 1.467 21.15 3.679 17.785 11.27 38.505 30.913 57.737 43.122 42.222 100.879 44.491 130.794 44.315 44.315-0.254 121.324-19.644 186.163-42.574 17.961 38.25 29.484 79.162 36.92 106.436H330.337v29.151h138.444V539.27H301.185v29.153H468.78v58.284c0 8.003 1.584 14.576 14.575 14.576h65.584v-72.86h182.19v-29.153H548.94v-58.304h145.74s-14.634-81.587-60.398-162c101.564-36.274 244.449-92.152 291.914-110.817z"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="kefu" unicode="&#58995;" d="M870.1 333.6v25.5c2 116.5-32.2 214.5-99.6 284-32.2 33.2-71 58.2-116 75.6-7.2 62.8-74.6 112.4-156.8 112.4-82.2 0-150.2-49.5-156.8-112.4-45-17.4-83.8-42.4-116-75.6-67.4-69.5-101.7-167-99.6-283.5v-31.2c-17.4-17.9-31.2-44.4-20.9-82.2 7.7-28.1 28.1-48.5 53.1-57.7 12.8-8.2 27.6-12.8 43.9-12.8 32.2-141 148.1-237 299.9-237 151.7 0 267.7 96 299.9 237.5 1 0 2-0.5 3.1-0.5 19.9 0 38.3 7.2 53.1 18.9 18.9 10.7 33.7 29.1 39.8 52.1 10.7 41-7.2 69.1-27.1 86.9z m-88.9-77.1c0-18.9-1.5-36.8-4.1-54.1-49.5-79.7-131.3-131.8-232.9-143-7.7 10.2-23 16.9-40.9 16.9-25.5 0-46-13.8-46-31.2 0-16.9 20.4-31.2 46-31.2 23 0 41.4 11.2 45.5 26.1 32.7 3.6 63.9 11.7 93.5 23.5 41.9 16.9 78.7 41.9 109.8 73.6 5.1 5.1 9.7 10.2 14.3 15.8-36.8-113-135.4-185.5-263.6-185.5h-1c-165 0-279.9 119-279.9 289.1l-0.5 16.3c0 7.2 1 26.6 2 45 68.5 25 130.3 120.6 155.3 164.5 23-31.2 75.6-91.4 156.3-122.6 30.1-11.7 60.8-17.9 90.9-24.5 59.8-12.8 116.5-25 154.8-75.1l1.5-1.5-1-2.1z m0 0"  horiz-adv-x="1024" />
-
-    
-    <glyph glyph-name="xiayibu" unicode="&#58880;" d="M1024.950857 384c0 2.706286-1.097143 5.193143-1.536 7.826286-0.585143 3.145143-0.658286 6.363429-1.901714 9.362285l-0.146286 0.365715c-1.682286 3.949714-4.388571 7.314286-7.021714 10.605714-1.024 1.316571-1.462857 2.925714-2.706286 4.096 0 0-0.146286 0-0.146286 0.146286l-241.590857 240.274285a45.714286 45.714286 0 0 1-64.365714-64.877714l162.889143-162.084571H46.665143a45.714286 45.714286 0 1 1 0-91.428572h821.76L705.536 176.201143a45.714286 45.714286 0 1 1 64.365714-64.877714l241.517715 240.274285 0.219428 0.146286c1.170286 1.243429 1.682286 2.779429 2.706286 4.096 2.633143 3.291429 5.339429 6.582857 7.021714 10.605714l0.146286 0.365715c1.243429 2.925714 1.316571 6.217143 1.901714 9.362285 0.438857 2.633143 1.462857 5.12 1.462857 7.753143V384c0 0.073143 0 0 0 0z"  horiz-adv-x="1025" />
-
-    
-    <glyph glyph-name="weibo" unicode="&#60174;" d="M413.422 292.65c-20.053 0-38.503-16.509-38.813-34.706-0.253-15.525 12.797-27.338 30.291-27.338 20.813-0.028 38.222 15.638 38.362 34.481 0.141 16.059-12.403 27.563-29.841 27.563zM463.316 306.487c-5.962-2.925-11.7-7.228-15.806-12.431-0.872-1.125 5.231-7.763 10.181-14.878 6.356 6.975 12.094 10.997 14.203 16.425 0.928 2.334-7.594 11.391-8.578 10.884zM589.259 385.378c-9.675 6.047-20.081 11.109-30.712 15.412-35.578 14.231-72.9 18.45-110.841 15.131-57.375-4.978-110.362-21.881-151.566-64.434-47.784-49.303-41.316-111.712 14.934-150.834 38.081-26.438 81.309-35.522 126.984-34.425 8.297 0 16.622-0.647 24.863 0.113 52.003 4.978 99.9 20.756 139.584 55.941 57.994 51.328 52.172 122.006-13.247 163.097z m-64.35-144.928c-19.744-29.925-54.703-48.094-92.672-48.291-47.869-0.309-83.784 26.578-90.141 68.4-1.406 8.55-1.013 17.944 0.928 26.325 9.647 41.034 38.053 63.956 76.725 74.306 38.194 10.125 73.716 3.516 101.503-26.831 23.006-25.116 23.934-63.394 3.656-93.909zM512.028 834C263.487 834 62 632.513 62 384s201.487-450 450-450c248.512 0 450 201.487 450 450 0 248.512-201.459 450-449.972 450z m214.594-584.353c-38.447-59.147-97.509-88.481-163.491-104.653-31.922-7.875-65.25-10.294-82.575-12.938-81.816 2.025-145.097 14.119-202.162 49.584-71.916 44.691-92.869 111.656-55.266 187.594 40.387 81.45 103.219 141.694 185.681 180.422 15.3 7.172 32.709 11.25 49.5 13.331 34.594 4.303 54.787-15.328 53.916-50.147-0.197-7.622-1.913-15.131-2.362-22.809-0.337-6.553 0.141-13.219 0.309-19.8 6.722 1.097 13.5 1.8 20.081 3.263 26.663 5.709 53.044 15.244 79.903 16.678 46.631 2.475 67.528-25.763 53.353-70.059-6.103-18.872-1.547-25.228 16.088-31.556 66.319-23.906 85.416-79.903 47.025-138.909z m-34.791 248.316c-10.969 13.95-35.859 17.184-43.734 17.269-11.644 0.084-21.037 9.619-20.925 21.234 0.084 11.588 9.506 20.897 21.037 20.897h0.169c5.147 0 51.3-1.322 76.556-33.328 10.013-12.684 20.278-35.241 12.15-70.341-2.25-9.788-10.941-16.369-20.531-16.369a19.75 19.75 0 0 0-4.725 0.591c-11.363 2.616-18.422 13.95-15.806 25.256 3.544 15.356 2.166 26.747-4.191 34.791zM815.834 429c-1.659-10.35-10.575-17.831-20.813-17.831-1.041 0-2.194 0.141-3.291 0.309-11.475 1.772-19.322 12.572-17.55 24.075 7.819 49.753-0.141 88.453-23.766 114.891-41.119 46.069-116.494 43.341-117.253 43.341-11.756-0.478-21.487 8.522-21.994 20.109-0.478 11.616 8.578 21.459 20.166 21.994 3.909 0.141 96.188 3.375 150.525-57.347 32.4-36.366 43.819-86.681 33.975-149.541z"  horiz-adv-x="1024" />
-
-    
-
-
-  </font>
-</defs></svg>
--- a/buyer/src/assets/iconfont/iconfont.ttf
+++ b/buyer/src/assets/iconfont/iconfont.ttf
--- a/buyer/src/assets/iconfont/iconfont.woff
+++ b/buyer/src/assets/iconfont/iconfont.woff
--- a/buyer/src/assets/iconfont/iconfont.woff2
+++ b/buyer/src/assets/iconfont/iconfont.woff2
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
@ -60,7 +60,7 @@
                  :key="index"
                  @click="receiveCoupon(item.id)"
                  >
-                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price}}</span>
+                  <span v-if="item.couponType == 'PRICE'">满{{ item.consumeThreshold }}减{{item.price | unitPrice}}</span>
                  <span v-if="item.couponType == 'DISCOUNT'">满{{ item.consumeThreshold }}打{{item.couponDiscount}}折</span>
                  </span>
              </p>
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@ -54,7 +54,7 @@
        <li class="hover-color" @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
        <li class="hover-color" @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
        <li v-if="$route.name !== 'Cart'" style="position:relative;" @mouseenter="getCartList">
-          <i class="cart-badge" v-show="cartNum">{{cartNum < 100 ? cartNum : '99'}}</i>
+          <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
          <Dropdown placement="bottom-start">
            <router-link to="cart" target="_blank">
              <Icon
--- a/buyer/src/components/like/index.vue
+++ b/buyer/src/components/like/index.vue
@ -11,7 +11,7 @@
      >
        <img :src="item.img" alt="" />
        <div class="likeTitle">{{ item.title }}</div>
-        <div class="likePrice">{{ item.price }}</div>
+        <div class="likePrice">{{ item.price | unitPrice }}</div>
      </Col>
    </Row>
  </div>
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@ -17,10 +17,10 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: 'http://127.0.0.1:8890',
-    buyer: 'http://127.0.0.1:8888',
-    seller: 'http://127.0.0.1:8889',
-    manager: 'http://127.0.0.1:8887'
+    common: 'https://common-api.pickmall.cn',
+    buyer: 'https://buyer-api.pickmall.cn',
+    seller: 'https://store-api.pickmall.cn',
+    manager: 'https://admin-api.pickmall.cn'
  },
  api_prod: {
    common: 'https://common-api.pickmall.cn',
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@ -17,9 +17,9 @@
      <div class="available-area">
        <div class="cart-steps">
          <span :class="stepIndex == 0 ? 'active' : ''">1.我的购物车</span>
-          <Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
+          <Icon :class="stepIndex == 0 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
          <span :class="stepIndex == 1 ? 'active' : ''">2.填写订单信息</span>
-          <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="iconfont icon-xiayibu"></Icon>
+          <Icon :class="stepIndex == 1 ? 'active-arrow' : ''" custom="icomoon icon-next"></Icon>
          <span :class="stepIndex == 2 ? 'active' : ''">3.成功提交订单</span>
        </div>
      </div>
@ -44,7 +44,7 @@
            <div>
              <Checkbox v-model="shop.checked" @on-change="changeChecked(shop.checked, 'shop', shop.storeId)"></Checkbox>
              <span class="go-shop-page" @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>
-              <Icon class="customer-service" custom="iconfont icon-kefu" />
+              <Icon class="customer-service" custom="icomoon icon-customer-service" />
            </div>
            <span class="shop-coupon" v-if="shop.couponList.length" :class="couponAvailable === index ? 'shop-coupon-show' : ''" @click.stop="showCoupon(shop.id, index)">
              <!-- 优惠券模态框 -->
--- a/buyer/src/pages/Login.vue
+++ b/buyer/src/pages/Login.vue
@ -112,10 +112,8 @@
          <span @click="$router.push('forgetPassword')">忘记密码</span>
        </div>
        <div class="other-login">
-          <Icon custom="iconfont icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
-          <Icon custom="iconfont icon-weixin" color="" class="icon-hover"  @click="handleWebLogin('WECHAT_PC')"/>
-          <!-- <Icon custom="iconfont icon-zhifubao" color="" class="icon-hover" @click="handleWebLogin('ALIPAY')"/> -->
-          <!-- <Icon custom="iconfont icon-weibo" color="" class="icon-hover" @click="handleWebLogin('WEIBO')"/> -->
+          <Icon custom="icomoon icon-qq" color="" class="icon-hover" @click="handleWebLogin('QQ')"/>
+          <Icon custom="icomoon icon-wechat" color="" class="icon-hover"  @click="handleWebLogin('WECHAT_PC')"/>
        </div>
      </div>
      <!-- 拼图验证码 -->
--- a/buyer/src/pages/home/MyShoppingCart.vue
+++ b/buyer/src/pages/home/MyShoppingCart.vue
@ -1,6 +1,10 @@
 <template>
  <div>
-    <Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买"></Table>
+    <Table border ref="selection" :columns="columns" :data="shoppingCart" size="large" no-data-text="您的购物车没有商品，请先添加商品到购物车再点击购买">
+      <template slot-scope="{row}" slot="price">
+        <span>{{row.price | unitPrice('￥')}}</span>
+      </template>
+    </Table>
    <div class="go-to">
      <Button @click="goTo" type="primary">去付款</Button>
    </div>
@ -55,7 +59,7 @@ export default {
        {
          title: '价格',
          width: 68,
-          key: 'price',
+          slot: 'price',
          align: 'center'
        }
      ]
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@ -15,7 +15,7 @@
            {{params.type === 'GOODS'? item.goodsName : item.storeName}}
          </div>
          <div class="goodsPrice">
-            <span v-if="params.type === 'GOODS'">{{item.price | unitPrice}}</span>
+            <span v-if="params.type === 'GOODS'">{{item.price | unitPrice('￥')}}</span>
            <Tag color="error" v-if="item.selfOperated">商家自营</Tag>
          </div>
          <div class="goodsBuy">
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@ -64,7 +64,7 @@

          <div>
            <span @click="shopPage(order.storeId)">{{ order.storeName }}</span
-            >&nbsp;<Icon custom="iconfont icon-kefu" />
+            >&nbsp;<Icon custom="icomoon icon-customer-service" />
          </div>
          <div>
            <!-- 订单基础操作 -->
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@ -39,7 +39,7 @@
    <!-- 订单商品 -->
    <div class="goods">
      <div class="shop-name">
-        <span @click="shopPage(order.order.storeId)">{{ order.order.storeName }}</span> &nbsp; <Icon custom="iconfont icon-kefu" />
+        <span @click="shopPage(order.order.storeId)">{{ order.order.storeName }}</span> &nbsp; <Icon custom="icomoon icon-customer-service" />
      </div>
      <table>
        <thead>
@ -64,9 +64,9 @@
              </div>
            </td>
            <td>{{ goods.id }}</td>
-            <td>{{ goods.goodsPrice | unitPrice }}</td>
+            <td>{{ goods.goodsPrice | unitPrice('￥') }}</td>
            <td>{{ goods.num }}</td>
-            <td>{{ (goods.goodsPrice * goods.num) | unitPrice }}</td>
+            <td>{{ (goods.goodsPrice * goods.num) | unitPrice('￥') }}</td>
          </tr>
        </tbody>
      </table>
--- a/buyer/src/pages/payment/Pay.vue
+++ b/buyer/src/pages/payment/Pay.vue
@ -9,9 +9,9 @@
            </div>
            <div class="cart-steps">
                <span :class="stepIndex==1?'active':''">1.我的购物车</span>
-                <Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
+                <Icon :class="stepIndex==1?'active-arrow':''" custom="icomoon icon-next"></Icon>
                <span :class="stepIndex==1?'active':''">2.填写订单信息</span>
-                <Icon :class="stepIndex==1?'active-arrow':''" custom="iconfont icon-xiayibu"></Icon>
+                <Icon :class="stepIndex==1?'active-arrow':''" custom="icomoon icon-next"></Icon>
                <span :class="stepIndex==2?'active':''">3.成功提交订单</span>
            </div>
        </div>
@ -63,7 +63,7 @@
                    <div class="shop-name">
                        <span>
                          <span class="hover-color"  @click="goShopPage(shop.storeId)">{{shop.storeName}}</span>&nbsp;&nbsp;
-                            <Icon class="hover-color" custom="iconfont icon-kefu" />
+                          <Icon class="hover-color" custom="icomoon icon-customer-service" />
                        </span>
                        <span>
                            <p style="width:120px">配送方式：</p>
@ -386,13 +386,17 @@ export default {
          })
        }
      })
+
      if (!params.remark.length) delete params.remark;
+
      this.$Spin.show();
      createTrade(params).then(res => {
        this.$Spin.hide();
        if (res.success) {
          this.$router.push({path: '/payment', query: {orderType: 'TRADE', sn: res.result.sn}});
        }
+      }).catch(() => {
+        this.$Spin.hide()
      });
    },
    useScope (type) {
--- a/buyer/src/pages/shopEntry/first-apply.vue
+++ b/buyer/src/pages/shopEntry/first-apply.vue
@ -9,18 +9,18 @@
          placeholder="请填写公司信息"
        />
      </FormItem>
-      <FormItem prop="addressIdPath" label="公司所在地">
-        <!-- <Input type="text" v-model="form.addressIdPath" placeholder="请选择公司所在地" /> -->
+      <FormItem prop="storeAddressIdPath" label="公司所在地">
+        <!-- <Input type="text" v-model="form.storeAddressIdPath" placeholder="请选择公司所在地" /> -->
        <region
          style="width: 250px"
          @selected="selectedRegion"
          :addressId="address"
        />
      </FormItem>
-      <FormItem prop="companyAddress" label="公司详细地址">
+      <FormItem prop="storeAddressDetail" label="公司详细地址">
        <Input
          type="text"
-          v-model="form.companyAddress"
+          v-model="form.storeAddressDetail"
          placeholder="请填写公司详细信息"
        />
      </FormItem>
@ -211,8 +211,8 @@ export default {
      },
      rules: { // 验证规则
        companyName: [{ required: true, message: '请填写公司信息' }],
-        addressIdPath: [{ required: true, message: '请选择公司所在地' }],
-        companyAddress: [{ required: true, message: '请填写公司详细地址' }],
+        storeAddressIdPath: [{ required: true, message: '请选择公司所在地' }],
+        storeAddressDetail: [{ required: true, message: '请填写公司详细地址' }],
        employeeNum: [
          { required: true, message: '请填写公司员工总数' },
          { pattern: RegExp.integer, message: '只能填写正整数' }
@ -270,18 +270,26 @@ export default {
    },
    selectedRegion (item) {
      // 地址选择回显
-      this.$set(this.form, 'addressIdPath', item[0].toString());
+      this.$set(this.form, 'storeAddressIdPath', item[0].toString());
      this.$set(
        this.form,
-        'addressPath',
+        'companyAddressPath',
        item[1].toString().replace(/\s/g, '')
      );
    },
    beforeUpload () {
      this.uploadLoading = true;
+      if (this.form.licencePhoto.length >= 3) {
+        this.$Message.warning('最多上传三张图片')
+        return false;
+      }
    },
    beforeUpload1 () {
      this.uploadLoading1 = true;
+      if (this.form.legalPhoto.length >= 3) {
+        this.$Message.warning('最多上传三张图片')
+        return false;
+      }
    },
    handleSuccess (res, file) {
      this.uploadLoading = false;
@ -328,7 +336,7 @@ export default {
      if (this.form.licencePhoto) {
        this.form.legalPhoto = this.content.legalPhoto.split(',');
        this.form.licencePhoto = this.content.licencePhoto.split(',');
-        this.address = this.form.addressIdPath;
+        this.address = this.form.storeAddressIdPath;
      }
    }
  }
--- a/buyer/src/pages/shopEntry/shop-entry.vue
+++ b/buyer/src/pages/shopEntry/shop-entry.vue
@ -28,13 +28,13 @@
      ></third-apply>

      <div class="success-page" v-if="currentIndex == 3">
-        <span v-if="storeDisable == '' || storeDisable == 'APPLYING'"
-          >入驻申请提交成功，等待平台审核</span
-        >
+        <span v-if="storeDisable == '' || storeDisable == 'APPLYING'">入驻申请提交成功，等待平台审核</span>
        <span v-if="storeDisable == 'OPEN'">申请已通过，请联系管理员</span>
        <span v-if="storeDisable == 'CLOSED'">店铺已关闭，重申请联系管理员</span>
+        <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
      </div>
-      <Button v-if="currentIndex == 3" @click="$router.push('/')">返回</Button>
+      <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
+      <Button type="primary" @click='currentIndex = 0' v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
    </div>

    <Modal
--- a/buyer/src/pages/shopEntry/third-apply.vue
+++ b/buyer/src/pages/shopEntry/third-apply.vue
@ -145,6 +145,7 @@ export default {
            .then((res) => {
              this.loading = false;
              if (res.success) this.$emit('change', 3);
+              this.$parent.getData()
            })
            .catch(() => {
              this.loading = false;
@ -156,6 +157,10 @@ export default {
    },
    beforeUpload () {
      this.uploadLoading = true;
+      if (this.form.storeLogo.length >= 3) {
+        this.$Message.warning('最多上传三张图片')
+        return false;
+      }
    },

    handleSuccess (res, file) {
--- a/manager/package.json
+++ b/manager/package.json
@ -27,6 +27,7 @@
    "print-js": "^1.0.63",
    "qrcodejs2": "0.0.2",
    "quill": "^1.3.7",
+    "vue-qr": "^2.3.0",
    "sass-loader": "^8.0.2",
    "sockjs-client": "^1.4.0",
    "stompjs": "^2.3.3",
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@ -412,3 +412,8 @@ export const getChildRegion = (id) => {
 export const resetPassword = (params) => {
  return postRequest(`/user/resetPassword/${params}"`);
 };
+
+// 初始化商品索引
+export const createIndex = () => {
+  return getRequest(`/elasticsearch`);
+};
--- a/manager/src/assets/qrcode.svg
+++ b/manager/src/assets/qrcode.svg
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@ -17,10 +17,10 @@ export default {
   * @description api请求基础路径
   */
  api_dev: {
-    common: 'http://192.168.0.103:8890',
+    common: 'https://common-api.pickmall.cn',
    buyer: 'https://buyer-api.pickmall.cn',
    seller: 'https://store-api.pickmall.cn',
-    manager: 'http://192.168.0.103:8887'
+    manager: 'https://admin-api.pickmall.cn'
  },
  api_prod: {
    common: 'https://common-api.pickmall.cn',
--- a/manager/src/libs/icon.js
+++ b/manager/src/libs/icon.js
--- a/manager/src/views/my-components/lili/icon-choose.vue
+++ b/manager/src/views/my-components/lili/icon-choose.vue
@ -1,221 +0,0 @@
-<template>
-  <div>
-    <div style="display:flex">
-      <Input
-        v-model="currentValue"
-        @on-change="handleChange"
-        :placeholder="placeholder"
-        :size="size"
-        :disabled="disabled"
-        :readonly="readonly"
-        :maxlength="maxlength"
-        :icon="currentValue"
-      />
-      <Button
-        @click="iconModalVisible=true"
-        :size="size"
-        :disabled="disabled"
-        :icon="icon"
-        style="margin-left:10px"
-      >选择图标</Button>
-    </div>
-
-    <Modal
-      title="选择图标"
-      v-model="iconModalVisible"
-      :width="950"
-      :styles="{top: '30px'}"
-      footer-hide
-      :z-index="1060"
-    >
-      <div class="icon-search">
-        <input
-          type="text"
-          v-model="key"
-          :placeholder="tip"
-          @input="handleInput"
-          @focus="handleFocus"
-          @blur="handleBlur"
-        >
-      </div>
-      <div class="icon-block icon-bar">
-        <div class="icon-wrap" v-for="(item, i) in iconData" :key="i" @click="hanleChoose(item)">
-          <div class="icons-item">
-            <Icon :type="item" style="font-size: 32px;"/>
-            <p>{{item}}</p>
-          </div>
-        </div>
-      </div>
-    </Modal>
-  </div>
-</template>
-
-<script>
-import { icons } from "@/libs/icon";
-export default {
-  name: "iconChoose",
-  props: {
-    value: {
-      type: String,
-      default: ""
-    },
-    size: String,
-    placeholder: {
-      type: String,
-      default: "输入图标名或选择图标"
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    maxlength: Number,
-    icon: {
-      type: String,
-      default: "md-ionic"
-    }
-  },
-  data() {
-    return {
-      iconModalVisible: false, // modal显隐
-      currentValue: this.value, // 当前值
-      iconData: [], // icon列表
-      key: "", // 关键词
-      tip: "输入英文关键词搜索，比如 success"
-    };
-  },
-  methods: {
-    init() {
-      let re = [];
-      icons.forEach(e => {
-        e.icons.forEach(item => {
-          re.push(item);
-        });
-      });
-      this.iconData = re;
-    },
-    handleInput() {
-      if (this.key) {
-        // 搜索
-        let re = [];
-        icons.forEach(e => {
-          e.tags.forEach(item => {
-            if (item.indexOf(this.key) >= 0) {
-              e.icons.forEach(r => {
-                re.push(r);
-              });
-            }
-          });
-        });
-        this.iconData = re;
-      } else {
-        this.init();
-      }
-    },
-    handleFocus() {
-      if (!this.key) {
-        this.tip = "";
-      }
-    },
-    handleBlur() {
-      if (!this.key) {
-        this.tip = "输入英文关键词搜索，比如 success";
-      }
-    },
-    handleChange(v) {
-      this.$emit("input", this.currentValue);
-      this.$emit("on-change", this.currentValue);
-    },
-    setCurrentValue(value) {
-      if (value === this.currentValue) {
-        return;
-      }
-      this.currentValue = value;
-    },
-    hanleChoose(v) {
-      this.currentValue = v;
-      this.$emit("input", this.currentValue);
-      this.$emit("on-change", this.currentValue);
-      this.iconModalVisible = false;
-    }
-  },
-  watch: {
-    value(val) {
-      this.setCurrentValue(val);
-    }
-  },
-  created() {
-    this.init();
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.icon-search {
-  position: relative;
-  margin: 20px auto 30px;
-  text-align: center;
-  input {
-    width: 500px;
-    box-sizing: border-box;
-    border: 0;
-    border-radius: 4px;
-    background: #f5f5f5;
-    text-align: center;
-    font-size: 14px;
-    outline: none;
-    margin: 0 auto;
-    padding: 8px 0;
-  }
-}
-.icon-block {
-  display: flex;
-  flex-wrap: wrap;
-  max-height: 500px;
-  overflow: auto;
-}
-.icon-bar {
-  overflow: auto;
-  overflow-x: hidden;
-}
-.icon-bar::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
-}
-
-.icon-bar::-webkit-scrollbar-thumb {
-  border-radius: 3px;
-  background: #c3c3c3;
-}
-
-.icon-bar::-webkit-scrollbar-track {
-  background: #fff;
-}
-.icon-wrap {
-  :hover {
-    color: #1890ff;
-    transition: color 0.3s;
-  }
-}
-.icons-item {
-  margin: 6px 6px 6px 0;
-  width: 145px;
-  text-align: center;
-  list-style: none;
-  cursor: pointer;
-  height: 100px;
-  color: #5c6b77;
-  transition: all 0.2s ease;
-  position: relative;
-  padding-top: 10px;
-  p {
-    padding-top: 15px;
-    margin: 5px;
-    font-size: 14px;
-  }
-}
-</style>
-
--- a/manager/src/views/promotion/coupon/couponPublish.vue
+++ b/manager/src/views/promotion/coupon/couponPublish.vue
@ -459,7 +459,7 @@ export default {
      let ids = [];
      let list = [];
      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {
@ -478,7 +478,7 @@ export default {
    },
    getGoodsCategory(e) {
      // 获取级联选择器商品分类id
-      console.log(e);
+      // console.log(e);
    },

    async getCagetoryList() {
--- a/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
+++ b/manager/src/views/promotion/pointsGoods/addPointsGoods.vue
@ -396,7 +396,7 @@ export default {
      let ids = [];
      let list = [];
      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {
--- a/manager/src/views/sys/menu-manage/menuManage.vue
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@ -111,34 +111,9 @@
                <Input v-model="form.name"/>
              </Tooltip>
            </FormItem>
-            <FormItem
-              label="图标"
-              prop="icon"
-            >
-              <icon-choose v-model="form.icon"></icon-choose>
-            </FormItem>
            <FormItem label="前端组件" prop="frontRoute" v-if="form.level != 0">
              <Input v-model="form.frontRoute"/>
            </FormItem>
-
-            <FormItem
-              label="第三方链接"
-              v-if="form.level == 2"
-              class="block-tool"
-            >
-              <Tooltip
-                placement="right"
-                content="前端组件需为 sys/monitor/monitor 时生效"
-                max-width="300"
-                transfer
-              >
-                <Input
-                  v-model="form.url"
-                  placeholder="http://"
-                  @on-change="changeEditUrl"
-                />
-              </Tooltip>
-            </FormItem>
            <FormItem label="排序值" prop="sortOrder">
              <Tooltip
                trigger="hover"
@ -235,34 +210,9 @@
            <Input v-model="formAdd.name"/>
          </Tooltip>
        </FormItem>
-        <FormItem
-          label="图标"
-          prop="icon"
-        >
-          <icon-choose v-model="formAdd.icon"></icon-choose>
-        </FormItem>
        <FormItem label="前端组件" prop="frontRoute" v-if="formAdd.level != 0">
          <Input v-model="formAdd.frontRoute"/>
        </FormItem>
-        <FormItem
-          label="第三方链接"
-          prop="url"
-          v-if="formAdd.level == 2"
-          class="block-tool"
-        >
-          <Tooltip
-            placement="right"
-            content="前端组件需为 sys/monitor/monitor 时生效"
-            max-width="300"
-            transfer
-          >
-            <Input
-              v-model="formAdd.url"
-              placeholder="http://"
-              @on-change="changeAddUrl"
-            />
-          </Tooltip>
-        </FormItem>
        <FormItem label="排序值" prop="sortOrder">
          <Tooltip
            trigger="hover"
@ -296,14 +246,10 @@ import {
  deletePermission,
  searchPermission,
 } from "@/api/index";
-import IconChoose from "@/views/my-components/lili/icon-choose";
 import util from "@/libs/util.js";

 export default {
  name: "menu-manage",
-  components: {
-    IconChoose,
-  },
  data() {
    return {
      loading: true, // 加载状态
@ -322,14 +268,12 @@ export default {
        id: "",
        title: "",
        name: "",
-        icon: "",
        path: "",
        frontRoute: "",
        parentId: "",
        buttonType: "",
        sortOrder: 0,
        level: 0,
-        url: "",
        showAlways: true,
      },
      formAdd: { // 添加表单
@ -340,7 +284,6 @@ export default {
        name: [
          {required: true, message: "路由英文名不能为空", trigger: "blur"},
        ],
-        icon: [{required: true, message: "图标不能为空", trigger: "click"}],
        path: [{required: true, message: "路径不能为空", trigger: "blur"}],
        frontRoute: [
          {required: true, message: "前端组件不能为空", trigger: "blur"},
@ -363,7 +306,7 @@ export default {
      this.getAllList();
    },

-    renderContent(h, {root, node, data}) {
+    renderContent(h, {root, node, data}) { // 渲染树形结构前面图标
      let icon = "";
      if (data.level == 0) {
        icon = "ios-navigate";
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@ -55,14 +55,14 @@
      </div>
      <div class="label-btns">
        <Button type="primary" @click="submit('formValidate')">保存</Button>
-
+        <Button type="primary" style="margin-left: 100px" @click="createIndex()">重新生成所有商品索引</Button>
      </div>

    </Form>
  </div>
 </template>
 <script>
-import { setSetting } from "@/api/index";
+import { setSetting,createIndex } from "@/api/index";
 import { handleSubmit } from "./validate";
 export default {
  props: ["res", "type"],
@ -90,13 +90,23 @@ export default {
    this.init();
  },
  methods: {
+    //保存
    submit(name) {
      let that = this;
       if( handleSubmit(that, name )){
        this.setupSetting()
      }
    },
-
+    //重新生成所有商品索引
+    createIndex(){
+      createIndex().then((res) => {
+        if (res.success) {
+          this.$Message.success("开始生成!");
+        } else {
+          this.$Message.error("服务器异常!");
+        }
+      });
+    },
    setupSetting() {
      setSetting(this.type, this.formValidate).then((res) => {
        if (res.success) {
--- a/seller/package.json
+++ b/seller/package.json
@ -29,6 +29,7 @@
    "sockjs-client": "^1.4.0",
    "stompjs": "^2.3.3",
    "swiper": "^6.3.5",
+    "vue-qr": "^2.3.0",
    "view-design": "^4.2.0",
    "vue": "^2.6.10",
    "vue-awesome": "^4.0.2",
--- a/seller/src/assets/qrcode.svg
+++ b/seller/src/assets/qrcode.svg
--- a/seller/src/libs/icon.js
+++ b/seller/src/libs/icon.js
--- a/seller/src/main.js
+++ b/seller/src/main.js
@ -54,6 +54,12 @@ Vue.prototype.setStore = setStore;
 Vue.prototype.getStore = getStore;
 Vue.prototype.removeStore = removeStore;
 Vue.prototype.md5 = md5;
+Vue.prototype.linkTo = function (goodsId, skuId, link='https://pc-b2b2c.pickmall.cn') {  // 跳转买家端商品
+  window.open(`${link}/goodsDetail?goodsId=${goodsId}&skuId=${skuId}`, '_blank')
+};
+Vue.prototype.wapLinkTo = function (goodsId, skuId) { // app端二维码
+  return `https://m-b2b2c.pickmall.cn/pages/product/goods?id=${skuId}&goodsId=${goodsId}`
+};

 Array.prototype.remove = function(from, to) {
  var rest = this.slice((to || from) + 1 || this.length);
--- a/seller/src/views/distribution/distributionGoods.vue
+++ b/seller/src/views/distribution/distributionGoods.vue
@ -31,7 +31,7 @@

                  <div style="margin-left: 13px;">
                    <div class="div-zoom" >
-                      <a>{{scope.row.goodsName}}</a>
+                      <a @click="linkTo(scope.row.id,scope.row.skuId)">{{scope.row.goodsName}}</a>
                    </div>
                  </div>
                </div>
--- a/seller/src/views/goods/goods-seller/goodsOperation.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperation.vue
@ -1839,18 +1839,19 @@ export default {
            this.$Message.error("请上传商品图片");
            return;
          }
-          if (
-            !this.baseInfoForm.storeCategoryPath ||
-            !this.baseInfoForm.storeCategoryPath.length
-          ) {
-            this.submitLoading = false;
-            this.$Message.error("请选择店内分类");
-            return;
-          }
+          // if (
+          //   !this.baseInfoForm.storeCategoryPath ||
+          //   !this.baseInfoForm.storeCategoryPath.length
+          // ) {
+          //   this.submitLoading = false;
+          //   this.$Message.error("请选择店内分类");
+          //   return;
+          // }
          //如果选择的是买家承担运费 则运费模板重置为0
          if (this.baseInfoForm.freightPayer == "BUYER") {
            this.baseInfoForm.templateId = 0;
          }
+          
          this.baseInfoForm.skuList = this.skuTableData.map((sku) => {
            delete sku._index;
            delete sku._rowKey;
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@ -51,8 +51,8 @@
        </Form>
      </Row>
      <Row class="operator padding-row">
-        <Button @click="add" type="primary">添加</Button>&nbsp;
-        <Button @click="delAll">批量下架</Button>&nbsp;
+        <Button @click="add" type="primary">添加</Button>
+        <Button @click="delAll" class="ml_10">批量下架</Button>
        <!-- <Button @click="upAll">批量上架</Button> -->
      </Row>
      <Row class="padding-row">
@ -106,7 +106,6 @@
 <script>
 import {
  getShopCouponList,
-  deleteShopCoupon,
  updateCouponStatus,
 } from "@/api/promotion";

--- a/seller/src/views/promotion/coupon/couponPublish.vue
+++ b/seller/src/views/promotion/coupon/couponPublish.vue
@ -545,11 +545,12 @@ export default {
      this.form.promotionGoodsList.splice(index, 1);
    },
    selectedGoodsData(item) {
+      console.log(item);
      // 回显已选商品
      let ids = [];
      let list = [];
      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@ -501,7 +501,7 @@ export default {
      let ids = [];
      let list = [];
      this.form.promotionGoodsList.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {
--- a/seller/src/views/promotion/pintuan/pintuanGoods.vue
+++ b/seller/src/views/promotion/pintuan/pintuanGoods.vue
@ -276,7 +276,7 @@ export default {
      let ids = [];
      let list = [];
      this.goodsData.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {
--- a/seller/src/views/promotion/seckill/seckillGoods.vue
+++ b/seller/src/views/promotion/seckill/seckillGoods.vue
@ -364,7 +364,7 @@ export default {
      let list = [];

      this.goodsList[this.tabIndex].list.forEach((e) => {
-        ids.push(e.id);
+        ids.push(e.skuId);
      });
      item.forEach((e) => {
        if (!ids.includes(e.id)) {