Merge branch 'master' of 121.43.114.153:/home/git/repositories/mshop

# Conflicts:
#	src/components/order/list/OrderList.vue

src/components/order/list/OrderList.vue

@@ -15,7 +15,6 @@
                 scrollTop: 0,
                 documentHeight: 0,
                 windowHeight: 0,
-                isload: false
             }
         },
         props: [
@@ -27,13 +26,8 @@
         methods: {
             getData(){
                 let _self = this;
-                if (this.datas == null && !(_self.page.isUpdate && !this.has_loaded))
-                    return
-
-                this.isload = true;
                 this.$store.commit('updateLoadingStatus', {isLoading: true});
                 this.$http.jsonp(Api.orderList() + '&curpage=' + this.curpage, {params: {state_type: _self.getParamState(_self.page.state)}}, {_timeout: 5000}).then(function (res) {
-                    this.isload = false;
                     this.$store.commit('updateLoadingStatus', {isLoading: false});
                     if (res.body.code != 200) {
                         this.$vux.toast.show({

src/components/order/list/OrderTabs.vue

@@ -11,11 +11,11 @@
         data(){
             return {
                 pages: [
-                    {isUpdate: true, title: "全部", index: 0, state: 0},
-                    {isUpdate: true, title: "待付款", index: 1, state: 10},
-                    {isUpdate: true, title: "待发货", index: 2, state: 20},
-                    {isUpdate: true, title: "待收货", index: 3, state: 30},
-                    {isUpdate: true, title: "已收货", index: 4, state: 40},
+                    { title: "全部", index: 0, state: 0},
+                    { title: "待付款", index: 1, state: 10},
+                    { title: "待发货", index: 2, state: 20},
+                    { title: "待收货", index: 3, state: 30},
+                    { title: "已收货", index: 4, state: 40},
                 ],
                 selected_page: -1
             }
@@ -24,7 +24,6 @@
             let _self = this;
             let nativeClickHandler = (index = 0) => {
                 _self.selected_page = index;
-                _self.pages[index].isUpdate = true;
             };
             //tab
             const tabs = this.pages.map((item, index) => {
@@ -33,7 +32,6 @@
             })
             //pages
             const lists = this.pages.map((item, index) => {
-                item.isUpdate=index==this.current_index;
                 return <OrderList page={item} class={{order_hide: this.current_index !== index}}/>
             })