diff --git a/buyer/src/assets/iconfont/icomoon.eot b/buyer/src/assets/iconfont/icomoon.eot new file mode 100644 index 00000000..5a5b53d3 Binary files /dev/null and b/buyer/src/assets/iconfont/icomoon.eot differ diff --git a/buyer/src/assets/iconfont/icomoon.svg b/buyer/src/assets/iconfont/icomoon.svg new file mode 100644 index 00000000..a44989ac --- /dev/null +++ b/buyer/src/assets/iconfont/icomoon.svg @@ -0,0 +1,14 @@ + + + +Generated by IcoMoon + + + + + + + + + + \ No newline at end of file diff --git a/buyer/src/assets/iconfont/icomoon.ttf b/buyer/src/assets/iconfont/icomoon.ttf new file mode 100644 index 00000000..b63f6d43 Binary files /dev/null and b/buyer/src/assets/iconfont/icomoon.ttf differ diff --git a/buyer/src/assets/iconfont/icomoon.woff b/buyer/src/assets/iconfont/icomoon.woff new file mode 100644 index 00000000..1a942db4 Binary files /dev/null and b/buyer/src/assets/iconfont/icomoon.woff differ diff --git a/buyer/src/assets/iconfont/iconfont.css b/buyer/src/assets/iconfont/iconfont.css index c15273a3..aded85f0 100644 --- 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,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') 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"; -} - diff --git a/buyer/src/assets/iconfont/iconfont.eot b/buyer/src/assets/iconfont/iconfont.eot deleted file mode 100644 index 070ceedc..00000000 Binary files a/buyer/src/assets/iconfont/iconfont.eot and /dev/null differ diff --git a/buyer/src/assets/iconfont/iconfont.js b/buyer/src/assets/iconfont/iconfont.js deleted file mode 100644 index 9e350850..00000000 --- a/buyer/src/assets/iconfont/iconfont.js +++ /dev/null @@ -1 +0,0 @@ -!function(t){var e,c,o,n,i,l,a='',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss");if(d&&!t.__iconfont__svg__cssinject__){t.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(t){console&&console.log(t)}}function s(){i||(i=!0,o())}e=function(){var t,e,c,o;(o=document.createElement("div")).innerHTML=a,a=null,(c=o.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",t=c,(e=document.body).firstChild?(o=t,(c=e.firstChild).parentNode.insertBefore(o,c)):e.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(e,0):(c=function(){document.removeEventListener("DOMContentLoaded",c,!1),e()},document.addEventListener("DOMContentLoaded",c,!1)):document.attachEvent&&(o=e,n=t.document,i=!1,(l=function(){try{n.documentElement.doScroll("left")}catch(t){return void setTimeout(l,50)}s()})(),n.onreadystatechange=function(){"complete"==n.readyState&&(n.onreadystatechange=null,s())})}(window); \ No newline at end of file diff --git a/buyer/src/assets/iconfont/iconfont.json b/buyer/src/assets/iconfont/iconfont.json deleted file mode 100644 index df039ece..00000000 --- a/buyer/src/assets/iconfont/iconfont.json +++ /dev/null @@ -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 - } - ] -} diff --git a/buyer/src/assets/iconfont/iconfont.svg b/buyer/src/assets/iconfont/iconfont.svg deleted file mode 100644 index 5355dc73..00000000 --- a/buyer/src/assets/iconfont/iconfont.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - -Created by iconfont - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buyer/src/assets/iconfont/iconfont.ttf b/buyer/src/assets/iconfont/iconfont.ttf deleted file mode 100644 index 300049b3..00000000 Binary files a/buyer/src/assets/iconfont/iconfont.ttf and /dev/null differ diff --git a/buyer/src/assets/iconfont/iconfont.woff b/buyer/src/assets/iconfont/iconfont.woff deleted file mode 100644 index 45836ec6..00000000 Binary files a/buyer/src/assets/iconfont/iconfont.woff and /dev/null differ diff --git a/buyer/src/assets/iconfont/iconfont.woff2 b/buyer/src/assets/iconfont/iconfont.woff2 deleted file mode 100644 index 887e2f28..00000000 Binary files a/buyer/src/assets/iconfont/iconfont.woff2 and /dev/null differ diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 2083586b..26cbbab2 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -60,7 +60,7 @@ :key="index" @click="receiveCoupon(item.id)" > - 满{{ item.consumeThreshold }}减{{item.price}} + 满{{ item.consumeThreshold }}减{{item.price | unitPrice}} 满{{ item.consumeThreshold }}打{{item.couponDiscount}}折

diff --git a/buyer/src/components/header/Header.vue b/buyer/src/components/header/Header.vue index 182a7183..79ef6eb0 100644 --- a/buyer/src/components/header/Header.vue +++ b/buyer/src/components/header/Header.vue @@ -54,7 +54,7 @@
  • 我的订单
  • 我的足迹
  • - {{cartNum < 100 ? cartNum : '99'}} + {{cartNum < 100 ? cartNum : '99'}}
    {{ item.title }}
    -
    {{ item.price }}
    +
    {{ item.price | unitPrice }}
    diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js index 4f37451c..d5cc3dc7 100644 --- 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', diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue index 53292ba0..b5b99543 100644 --- a/buyer/src/pages/Cart.vue +++ b/buyer/src/pages/Cart.vue @@ -17,9 +17,9 @@
    1.我的购物车 - + 2.填写订单信息 - + 3.成功提交订单
    @@ -44,7 +44,7 @@
    {{shop.storeName}} - +
    diff --git a/buyer/src/pages/Login.vue b/buyer/src/pages/Login.vue index 284ce2fe..a078e266 100644 --- a/buyer/src/pages/Login.vue +++ b/buyer/src/pages/Login.vue @@ -112,10 +112,8 @@ 忘记密码 diff --git a/buyer/src/pages/home/MyShoppingCart.vue b/buyer/src/pages/home/MyShoppingCart.vue index 0e29dda2..f768dec1 100644 --- a/buyer/src/pages/home/MyShoppingCart.vue +++ b/buyer/src/pages/home/MyShoppingCart.vue @@ -1,6 +1,10 @@