fe / yohoblk-wap · Commits

Go to a project

Authored by ccbikai
Commit bbad32f7af2a28f4fda2a1c91a185cf50809da11 2 parents f5aa13ac ed405b90

Merge branch 'develop' into release/1.0

Inline Side-by-side
Showing 4 changed files with 5 additions and 6 deletions
... ... @@ -76,7 +76,7 @@ if (isProduction) {
domains: {
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
singleApi: 'http://192.168.102.31:8092/'
singleApi: 'http://api_single.yoho.cn/'
},
memcache: {
master: ['memcache1.yohoops.org:12111', 'memcache2.yohoops.org:12111', 'memcache3.yohoops.org:12111'],
... ...
... ... @@ -29,6 +29,7 @@
this.list = res.data;
});
}
// ,
// ready() {
// var a =document.querySelector('.sidebar')
... ... @@ -51,7 +52,6 @@
right: 0;
bottom: 0;
left: 0;
overflow-x: hidden;
overflow-y: auto;
}
... ... @@ -72,10 +72,9 @@
content: "";
position: absolute;
left: 30px;
bottom: -2PX;
width: 100%;
height: 0;
border-top: 2PX solid #eee;
border-bottom: 1px solid #eee;
}
&:last-child:after {
... ...
<template>
<div class="order-wrapper" v-if="orderList.length > 0">
<div class="order-wrapper" v-show="orderList.length > 0">
<ul id="order-list" v-infinite-scroll="getOrderData()" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
<li class="order-item" v-for="(index, order) in orderList">
<div class="order-detail">
... ...
<template>
<div class="order-wrapper return-goods" v-if="orderList.length > 0">
<div class="order-wrapper return-goods" v-show="orderList.length > 0">
<ul v-infinite-scroll="getRefundData()" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
<li class="order-item" v-for="(index, order) in orderList">
<div class="order-detail">
... ...