提交 1efb0fc3 编写于 作者: M maguohua

update

上级 b2796ed0
!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
!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:"a81083d3331bf9f3b1e9",1:"b7c79d574adf705e82da",2:"6200c8da1ce2fe5c840c",3:"19633589ee1b43feb21b",4:"26b6be5b897daec4488d",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:"8f96f41bda70207741e2"}[e]+".min.js",c.appendChild(b)}},d.m=e,d.c=c,d.p="/elm/"}([]);
\ No newline at end of file
......@@ -99,9 +99,12 @@ export default {
methods: {
//到达底部加载更多数据
async loaderMore(){
//防止重复请求
if (this.preventRepeatReuqest) {
return
//demo因为是获取模拟数据,同步过程不需要进行判断
if (process.env.NODE_ENV == 'development') {
//防止重复请求
if (this.preventRepeatReuqest) {
return
}
}
this.preventRepeatReuqest = true;
......@@ -110,7 +113,7 @@ export default {
this.showLoading = true;
let res = await shopList(this.latitude, this.longitude, this.offset, this.restaurantCategoryId);
this.shopListArr = [...this.shopListArr, ...res];
this.showLoading = false;
this.hideLoading();
//当获取数据小于20,说明没有更多数据,不需要再次请求数据
if (res.length < 20) {
return
......@@ -126,12 +129,7 @@ export default {
this.offset = 0;
this.showLoading = true;
this.shopListArr = await shopList(this.latitude, this.longitude, this.offset, '', this.restaurantCategoryIds, this.sortByType, this.deliveryMode, this.supportIds);
if (process.env.NODE_ENV !== 'development') {
this.shopListArr = [...this.shopListArr.reverse()];
this.hideLoading();
}else{
this.showLoading = false;
}
this.hideLoading();
},
hideLoading(){
if (process.env.NODE_ENV !== 'development') {
......@@ -139,7 +137,7 @@ export default {
this.timer = setTimeout(() => {
clearTimeout(this.timer);
this.showLoading = false;
}, 400)
}, 600)
}else{
this.showLoading = false;
}
......
......@@ -23,9 +23,9 @@
</template>
<script>
import headTop from '../../components/header/head'
import {currentcity, searchplace} from '../../service/getData'
import {getStore, setStore} from '../../config/mUtils'
import headTop from 'src/components/header/head'
import {currentcity, searchplace} from 'src/service/getData'
import {getStore, setStore} from 'src/config/mUtils'
export default {
data(){
......@@ -102,7 +102,7 @@
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.city_container{
padding-top: 2.35rem;
}
......
......@@ -56,10 +56,10 @@
</template>
<script>
import headTop from '../../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapState, mapMutations} from 'vuex'
import {getAddress, getUser, postAddAddress} from '../../../../service/getData'
import alertTip from '../../../../components/common/alertTip'
import {getAddress, getUser, postAddAddress} from 'src/service/getData'
import alertTip from 'src/components/common/alertTip'
export default {
data(){
......@@ -128,7 +128,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../style/mixin';
@import 'src/style/mixin';
.address_page{
position: fixed;
......
......@@ -22,8 +22,8 @@
</template>
<script>
import headTop from '../../../../../components/header/head'
import {searchNearby} from '../../../../../service/getData'
import headTop from 'src/components/header/head'
import {searchNearby} from 'src/service/getData'
import {mapMutations} from 'vuex'
export default {
......@@ -56,7 +56,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../../style/mixin';
@import 'src/style/mixin';
.search_address_page{
position: fixed;
......
......@@ -52,10 +52,10 @@
</template>
<script>
import headTop from '../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapState, mapMutations} from 'vuex'
import {getAddress} from '../../../service/getData'
import alertTip from '../../../components/common/alertTip'
import {getAddress} from 'src/service/getData'
import alertTip from 'src/components/common/alertTip'
export default {
data(){
......@@ -126,7 +126,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: fixed;
......
......@@ -12,7 +12,7 @@
</template>
<script>
import headTop from '../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapMutations} from 'vuex'
export default {
......@@ -41,7 +41,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: fixed;
......
......@@ -42,10 +42,10 @@
</template>
<script>
import headTop from '../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapState, mapMutations} from 'vuex'
import {payRequest} from '../../../service/getData'
import alertTip from '../../../components/common/alertTip'
import {payRequest} from 'src/service/getData'
import alertTip from 'src/components/common/alertTip'
export default {
data(){
......@@ -130,7 +130,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: fixed;
......
......@@ -21,9 +21,9 @@
</template>
<script>
import headTop from '../../../components/header/head'
import {getRemark} from '../../../service/getData'
import loading from '../../../components/common/loading'
import headTop from 'src/components/header/head'
import {getRemark} from 'src/service/getData'
import loading from 'src/components/common/loading'
import {mapMutations} from 'vuex'
export default {
......@@ -71,7 +71,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: fixed;
......
......@@ -22,10 +22,10 @@
</template>
<script>
import headTop from '../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapState, mapMutations} from 'vuex'
import {rePostVerify, validateOrders} from '../../../service/getData'
import alertTip from '../../../components/common/alertTip'
import {rePostVerify, validateOrders} from 'src/service/getData'
import alertTip from 'src/components/common/alertTip'
export default {
data(){
......@@ -107,7 +107,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.validation_page{
position: fixed;
......
......@@ -125,11 +125,11 @@
<script>
import {mapState, mapMutations} from 'vuex'
import headTop from '../../components/header/head'
import alertTip from '../../components/common/alertTip'
import loading from '../../components/common/loading'
import {checkout, getAddress, placeOrders} from '../../service/getData'
import {imgBaseUrl} from '../../config/env'
import headTop from 'src/components/header/head'
import alertTip from 'src/components/common/alertTip'
import loading from 'src/components/common/loading'
import {checkout, getAddress, placeOrders} from 'src/service/getData'
import {imgBaseUrl} from 'src/config/env'
export default {
data(){
......@@ -267,7 +267,7 @@
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.confirmOrderContainer{
padding-top: 1.95rem;
......
......@@ -7,9 +7,9 @@
</template>
<script>
import headTop from '../../components/header/head'
import {getImgPath} from '../../components/common/mixin'
import footGuide from '../../components/footer/footGuide'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
import footGuide from 'src/components/footer/footGuide'
export default {
data(){
......@@ -33,7 +33,7 @@
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: absolute;
......
......@@ -173,10 +173,10 @@
<script>
import {mapState, mapMutations} from 'vuex'
import headTop from '../../components/header/head'
import shopList from '../../components/common/shoplist'
import {getImgPath} from '../../components/common/mixin'
import {msiteAdress, foodCategory, foodDelivery, foodActivity} from '../../service/getData'
import headTop from 'src/components/header/head'
import shopList from 'src/components/common/shoplist'
import {getImgPath} from 'src/components/common/mixin'
import {msiteAdress, foodCategory, foodDelivery, foodActivity} from 'src/service/getData'
export default {
data(){
......@@ -336,7 +336,7 @@ export default {
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.food_container{
padding-top: 3.6rem;
}
......@@ -429,7 +429,6 @@ export default {
border-radius: 0.8rem;
vertical-align: middle;
margin-right: 0.25rem;
transform: scale(.8);
}
.category_arrow{
vertical-align: middle;
......@@ -512,7 +511,7 @@ export default {
.filter_li{
display: flex;
align-items: center;
border: 0.025rem solid #eee;
border: 0.025rem solid #ccc;
@include wh(4.7rem, 1.4rem);
margin-right: 0.25rem;
border-radius: 0.125rem;
......
......@@ -23,9 +23,9 @@
</template>
<script>
import headTop from '../../components/header/head'
import alertTip from '../../components/common/alertTip'
import {mobileCode, checkExsis, sendMobile} from '../../service/getData'
import headTop from 'src/components/header/head'
import alertTip from 'src/components/common/alertTip'
import {mobileCode, checkExsis, sendMobile} from 'src/service/getData'
export default {
data(){
......@@ -123,7 +123,7 @@
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.restContainer{
padding-top: 1.95rem;
......
......@@ -33,10 +33,10 @@
</template>
<script>
import headTop from '../../../../components/header/head'
import {getImgPath} from '../../../../components/common/mixin'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
import {mapState,mapActions,} from 'vuex'
import {getAddressList} from '../../../../service/getData'
import {getAddressList} from 'src/service/getData'
export default {
data(){
......@@ -88,7 +88,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: absolute;
......
......@@ -36,8 +36,8 @@
</template>
<script>
import headTop from '../../../../../components/header/head'
import {getImgPath} from '../../../../../components/common/mixin'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
import {mapState, mapMutations} from 'vuex'
export default {
data(){
......@@ -142,7 +142,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../../style/mixin';
@import 'src/style/mixin';
.router-slid-enter-active, .router-slid-leave-active {
transition: all .4s;
}
......
......@@ -25,9 +25,9 @@
</template>
<script>
import headTop from '../../../../../../components/header/head'
import {getImgPath} from '../../../../../../components/common/mixin'
import {getSearchAddress} from '../../../../../../service/getData'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
import {getSearchAddress} from 'src/service/getData'
import {mapMutations, mapState} from 'vuex'
export default {
data(){
......@@ -92,7 +92,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: absolute;
......
......@@ -17,8 +17,8 @@
</template>
<script>
import headTop from '../../../components/header/head'
import {getImgPath} from '../../../components/common/mixin'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
import {mapMutations,mapState} from 'vuex'
export default {
data(){
......@@ -71,7 +71,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: absolute;
......
......@@ -137,11 +137,11 @@
</template>
<script>
import headTop from '../../components/header/head'
import footGuide from '../../components/footer/footGuide'
import headTop from 'src/components/header/head'
import footGuide from 'src/components/footer/footGuide'
import {mapState, mapMutations} from 'vuex'
import {imgBaseUrl} from '../../config/env'
import {getImgPath} from '../../components/common/mixin'
import {imgBaseUrl} from 'src/config/env'
import {getImgPath} from 'src/components/common/mixin'
export default {
data(){
......@@ -213,7 +213,7 @@ export default {
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
.profile_page{
p, span{
......
......@@ -97,8 +97,8 @@
<script>
import {mapState} from 'vuex'
import headTop from '../../../../components/header/head'
import {getImgPath} from '../../../../components/common/mixin'
import headTop from 'src/components/header/head'
import {getImgPath} from 'src/components/common/mixin'
export default {
data(){
......@@ -128,7 +128,7 @@
</script>
<style lang="scss" scoped>
@import '../../../../style/mixin';
@import 'src/style/mixin';
.safe_shop{
position: fixed;
......
......@@ -77,9 +77,9 @@
</template>
<script>
import headTop from '../../../components/header/head'
import headTop from 'src/components/header/head'
import {mapState} from 'vuex'
import {getImgPath} from '../../../components/common/mixin'
import {getImgPath} from 'src/components/common/mixin'
export default {
data(){
......@@ -110,7 +110,7 @@
</script>
<style lang="scss" scoped>
@import '../../../style/mixin';
@import 'src/style/mixin';
.rating_page{
position: absolute;
......
......@@ -307,11 +307,11 @@
<script>
import {mapState, mapMutations} from 'vuex'
import {msiteAdress, shopDetails, foodMenu, getRatingList, ratingScores, ratingTags} from '../../service/getData'
import loading from '../../components/common/loading'
import buyCart from '../../components/common/buyCart'
import ratingStar from '../../components/common/ratingStar'
import {loadMore, getImgPath} from '../../components/common/mixin'
import {msiteAdress, shopDetails, foodMenu, getRatingList, ratingScores, ratingTags} from 'src/service/getData'
import loading from 'src/components/common/loading'
import buyCart from 'src/components/common/buyCart'
import ratingStar from 'src/components/common/ratingStar'
import {loadMore, getImgPath} from 'src/components/common/mixin'
import BScroll from 'better-scroll'
export default {
......@@ -622,15 +622,17 @@
},
beforeEnter(el){
el.style.transform = `translate3d(0,${37 + this.elBottom - this.windowHeight}px,0)`;
el.children[0].style.transform = `translate3d(${this.elLeft - 31}px,0,0)`;
el.children[0].style.transform = `translate3d(${this.elLeft - 30}px,0,0)`;
el.children[0].style.opacity = 0;
},
afterEnter(el){
el.style.transform = `translate3d(0,0,0)`;
el.children[0].style.transform = `translate3d(0,0,0)`;
el.style.transition = 'all .55s cubic-bezier(0.3, -0.25, 0.7, -0.15)';
el.children[0].style.transition = 'all .55s linear';
el.style.transition = 'transform .55s cubic-bezier(0.3, -0.25, 0.7, -0.15)';
el.children[0].style.transition = 'transform .55s linear';
//圆点到达目标点后移出
this.showMoveDot = this.showMoveDot.map(item => false);
el.children[0].style.opacity = 1;
//监听运动结束,通知父级进行后续操作
el.children[0].addEventListener('transitionend', () => {
this.listenInCart();
......@@ -683,7 +685,7 @@
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
@import 'src/style/mixin';
@keyframes mymove{
0% { transform: scale(1) }
25% { transform: scale(.8) }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册