update

README.md

@@ -81,7 +81,7 @@ npm run build
 
 ## 效果演示
 
-#### (演示demo是上个月版本，使用的是模拟数据，ios会出现卡顿的现象，且很多已修复的bug未更新，最新效果请clone代码并运行，我会尽快更新demo);
+#### (demo使用的是模拟数据，数据是固定的，要获取真实的数据，请clone代码并运行);
 
 [demo地址](http://test.fe.ptdev.cn/elm/)（请用chrome手机模式预览）
    

elm/static/js/manifest.js

-!function(e){function d(a){if(c[a])return c[a].exports;var f=c[a]={exports:{},id:a,loaded:!1};return e[a].call(f.exports,f,f.exports,d),f.loaded=!0,f.exports}var a=window.webpackJsonp;window.webpackJsonp=function(b,o){for(var r,t,i=0,n=[];i<b.length;i++)t=b[i],f[t]&&n.push.apply(n,f[t]),f[t]=0;for(r in o)e[r]=o[r];for(a&&a(b,o);n.length;)n.shift().call(null,d);if(o[0])return c[0]=0,d(0)};var c={},f={45:0};d.e=function(e,a){if(0===f[e])return a.call(null,d);if(void 0!==f[e])f[e].push(a);else{f[e]=[a];var c=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.src=d.p+"static/js/"+({0:"msite",1:"shop",2:"food",3:"confirmOrder",4:"foodDetail",5:"benefit",6:"order",7:"pointsDetail",8:"hbDescription",9:"coupon",10:"balanceDetail",11:"commend",12:"orderDetail",13:"hbHistory",14:"info",15:"points",16:"balance",17:"profile",18:"find",19:"remark",20:"download",21:"payment",22:"chooseAddress",23:"addAddress",24:"search",25:"useCart",26:"login",27:"forget",28:"userValidation",29:"exchange",30:"vipcard",31:"questionDetail",32:"invoiceRecord",33:"shopDetail",34:"shopSafe",35:"setusername",36:"addDetail",37:"add",38:"address",39:"vipDescription",40:"service",41:"home",42:"invoice",43:"searchAddress",44:"city",46:"vendor",47:"app"}[e]||e)+"."+{0:"066432a706855626678e",1:"d86b20d070242298a269",2:"c27486b50cfc7ebb7e40",3:"19633589ee1b43feb21b",4:"9de4ebe82ee78a146152",5:"3c37d72dba71698fec25",6:"f46543fc4345862cd3fc",7:"248906e5210f9f346fef",8:"253b0617f7c18b6a9082",9:"dbd9d4857a608001765b",10:"b42ac78c766f4d7283f2",11:"535b22fd4c3b320d337e",12:"03afc5015b6d4c4b077e",13:"2b5165f28d6b7dc54b6b",14:"65cb73894af3ae68e508",15:"2552432398477d78ec90",16:"d7f83eb10a6ab615e128",17:"474d739d19386c29bf7f",18:"ca0912d193efe454b01b",19:"df122f82bcadabd3b569",20:"5f3fe4247c5d5b31ad60",21:"d4a94a4da2e4cf6de2da",22:"456d0ad17430351ed257",23:"265d02a698cc74709792",24:"7cfe53d54bc624a96bd4",25:"704925a5f050663a0f9c",26:"7674099251d231d9aeb3",27:"05f3611ba5015b7b05eb",28:"dba4aa6d8c2c59910878",29:"4589d5ba736698eea812",30:"5c16fbb55662c97f9d13",31:"af23494231bcf0e70d19",32:"99aa3c4c658da71f7bd8",33:"8fad42e551af09ddb5ff",34:"7c96fd26e1b72995fb90",35:"a3d19aa3d36368f85a69",36:"59857586ac025c832508",37:"d225996cb1a6fc9450e4",38:"3023bef405dbe0be5b54",39:"0d0d872a05f42db79431",40:"641738d967d031c62959",41:"56da69743546eff2aea2",42:"33fd5b93d70c56981e77",43:"d6be54125d343cf2b594",44:"118df03f059bb12ad157",46:"3513ab97f1954046b7fd",47:"9097ea28d3dd3c0d4ca6"}[e]+".min.js",c.appendChild(b)}},d.m=e,d.c=c,d.p="/elm/"}([]);
\ No newline at end of file
+!function(e){function d(a){if(f[a])return f[a].exports;var c=f[a]={exports:{},id:a,loaded:!1};return e[a].call(c.exports,c,c.exports,d),c.loaded=!0,c.exports}var a=window.webpackJsonp;window.webpackJsonp=function(b,o){for(var r,t,i=0,n=[];i<b.length;i++)t=b[i],c[t]&&n.push.apply(n,c[t]),c[t]=0;for(r in o)e[r]=o[r];for(a&&a(b,o);n.length;)n.shift().call(null,d);if(o[0])return f[0]=0,d(0)};var f={},c={45:0};d.e=function(e,a){if(0===c[e])return a.call(null,d);if(void 0!==c[e])c[e].push(a);else{c[e]=[a];var f=document.getElementsByTagName("head")[0],b=document.createElement("script");b.type="text/javascript",b.charset="utf-8",b.async=!0,b.src=d.p+"static/js/"+({0:"msite",1:"shop",2:"food",3:"confirmOrder",4:"foodDetail",5:"benefit",6:"order",7:"pointsDetail",8:"hbDescription",9:"coupon",10:"balanceDetail",11:"commend",12:"orderDetail",13:"hbHistory",14:"info",15:"points",16:"balance",17:"profile",18:"find",19:"remark",20:"download",21:"payment",22:"chooseAddress",23:"addAddress",24:"search",25:"useCart",26:"login",27:"forget",28:"userValidation",29:"exchange",30:"vipcard",31:"questionDetail",32:"invoiceRecord",33:"shopDetail",34:"shopSafe",35:"setusername",36:"addDetail",37:"add",38:"address",39:"vipDescription",40:"service",41:"home",42:"invoice",43:"searchAddress",44:"city",46:"vendor",47:"app"}[e]||e)+"."+{0:"b6395a7462e4f34f6256",1:"02f0ad8d445c8752de66",2:"c5f3f734f7d415694ff4",3:"19633589ee1b43feb21b",4:"9de4ebe82ee78a146152",5:"3c37d72dba71698fec25",6:"f46543fc4345862cd3fc",7:"248906e5210f9f346fef",8:"253b0617f7c18b6a9082",9:"dbd9d4857a608001765b",10:"b42ac78c766f4d7283f2",11:"535b22fd4c3b320d337e",12:"03afc5015b6d4c4b077e",13:"2b5165f28d6b7dc54b6b",14:"65cb73894af3ae68e508",15:"2552432398477d78ec90",16:"d7f83eb10a6ab615e128",17:"474d739d19386c29bf7f",18:"ca0912d193efe454b01b",19:"df122f82bcadabd3b569",20:"5f3fe4247c5d5b31ad60",21:"d4a94a4da2e4cf6de2da",22:"456d0ad17430351ed257",23:"265d02a698cc74709792",24:"7cfe53d54bc624a96bd4",25:"704925a5f050663a0f9c",26:"7674099251d231d9aeb3",27:"05f3611ba5015b7b05eb",28:"dba4aa6d8c2c59910878",29:"4589d5ba736698eea812",30:"5c16fbb55662c97f9d13",31:"af23494231bcf0e70d19",32:"99aa3c4c658da71f7bd8",33:"8fad42e551af09ddb5ff",34:"7c96fd26e1b72995fb90",35:"a3d19aa3d36368f85a69",36:"59857586ac025c832508",37:"d225996cb1a6fc9450e4",38:"3023bef405dbe0be5b54",39:"0d0d872a05f42db79431",40:"641738d967d031c62959",41:"56da69743546eff2aea2",42:"33fd5b93d70c56981e77",43:"d6be54125d343cf2b594",44:"118df03f059bb12ad157",46:"3513ab97f1954046b7fd",47:"9097ea28d3dd3c0d4ca6"}[e]+".min.js",f.appendChild(b)}},d.m=e,d.c=f,d.p="/elm/"}([]);
\ No newline at end of file

src/components/common/shoplist.vue

@@ -187,6 +187,7 @@ export default {
 			.shop_title{
 				width: 8.5rem;
 				color: #333;
+				padding-top: .01rem;
 				@include font(0.65rem, 0.65rem, 'PingFangSC-Regular');
 				font-weight: 700;
 			}
@@ -194,6 +195,7 @@ export default {
 				content: '品牌';
 				display: inline-block;
 				font-size: 0.5rem;
+				line-height: .6rem;
 				background-color: #ffd930;
 				padding: 0 0.1rem;
 				border-radius: 0.1rem;

src/page/shop/shop.vue

@@ -549,6 +549,9 @@
                     this.$refs.cartContainer.addEventListener('animationend', () => {
                         this.receiveInCart = false;
                     })
+                    this.$refs.cartContainer.addEventListener('webkitAnimationEnd', () => {
+                        this.receiveInCart = false;
+                    })
                 }
             },
             async changeTgeIndex(index, name){
@@ -632,6 +635,9 @@
                 el.children[0].addEventListener('transitionend', () => {
                     this.listenInCart();
                 })
+                el.children[0].addEventListener('webkitAnimationEnd', () => {
+                    this.listenInCart();
+                })
             },
         },
         watch: {
@@ -1081,7 +1087,7 @@
                 background-color: #3d3d3f;
                 position: absolute;
                 padding: .4rem;
-                border: 0.25rem solid #444;
+                border: 0.18rem solid #444;
                 border-radius: 50%;
                 left: .5rem;
                 top: -.7rem;