Merge remote-tracking branch 'origin/develop' into develop

@@ -39,6 +39,17 @@ module.exports = {
         timeout: 1000,
         retries: 0
     },
+    interfaceShunt: {
+        useInterfaceShunt: false,
+        tencentServers: {
+            api: ['123.206.1.98', '123.206.2.80'],
+            service: ['123.206.1.98', '123.206.2.80']
+        },
+        awsServers: {
+            api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
+            service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
+        }
+    },
     loggers: {
         infoFile: {
             name: 'info',
@@ -76,7 +87,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'],
@@ -86,7 +97,18 @@ if (isProduction) {
             retries: 0
         },
         useOneapm: true,
-        useCache: true
+        useCache: true,
+        interfaceShunt: {
+            useInterfaceShunt: true,
+            tencentServers: {
+                api: ['123.206.1.98', '123.206.2.80'],
+                service: ['123.206.1.98', '123.206.2.80']
+            },
+            awsServers: {
+                api: 'app-java-168863769.cn-north-1.elb.amazonaws.com.cn',
+                service: 'service-yoho-579825100.cn-north-1.elb.amazonaws.com.cn'
+            }
+        }
     });
 } else if (isTest) {
     Object.assign(module.exports, {

@@ -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,10 @@
                 content: "";
                 position: absolute;
                 left: 30px;
-                bottom: -2PX;
+                bottom: 0;
                 width: 100%;
                 height: 0;
-                border-top: 2PX solid #eee;
+                border-bottom: 1px solid #eee;
             }
 
             &:last-child:after {

@@ -35,8 +35,6 @@
 
         methods: {
             getCoinData() {
-                let _that = this;
-
                 this.busy = true;
                 if (this.page >= this.pageTotal) {
                     return;
@@ -49,10 +47,10 @@
                     }
                 }).then(result => {
                     if (result.code === 200) {
-                        _that.busy = false;
+                        this.busy = false;
                         if (result.data.coinlist.length > 0) {
-                            this.$set('coinList', _that.coinList.concat(result.data.coinlist));
-                            _that.pageTotal = result.data.pageTotal;
+                            this.$set('coinList', this.coinList.concat(result.data.coinlist));
+                            this.pageTotal = result.data.pageTotal;
                         }
                     }
                 }).fail(() => {

 <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">

@@ -196,8 +196,8 @@
     }
 
     .show-box.brand {
-        $lh: 68px;
         overflow: hidden;
+        $lh: 68px;
 
         img {
             height: 68px;
@@ -223,7 +223,6 @@
             line-height: $lh;
             color: #b0b0b0;
         }
-
     }
 
     .product-detail-desc {
@@ -232,6 +231,10 @@
             width: 100% !important;
             height: auto !important;
         }
+
+        table {
+            width: 100%;
+        }
     }
 
     i.info {
@@ -273,7 +276,6 @@
             &.highlight {
                 color: #d0021b;
             }
-
         }
     }
 
@@ -328,7 +330,6 @@
             line-height: 66px;
             text-align: center;
         }
-
     }
 
     .wash-condition {
@@ -355,7 +356,6 @@
             color: #c7c7c7;
             min-width: 100px;
         }
-
     }
 
     .model-avatar {
@@ -426,7 +426,7 @@
                             this.cartCount = result.data.goods_count;
 
                             selector.playAnimation();
-                        } 
+                        }
 
                         this.showFeatureSelector = false;
                         tip(result.message);