refactor：tabbar修改

orderPages/storeService/index.vue

@@ -95,9 +95,13 @@
                     orderType: 1,
                     serviceObjectId: this.serviceObject.id,
                     serviceAttribute: 1,
-                    serviceStoreId: this.store.storeId
+                    serviceStoreId: this.store.storeId,
+                    serviceTypeId:this.storeServiceList[this.index].id
                 }).then(res=>{
-                    console.log('+++++++commonGeneralOrder+++++++++',res)
+                    uni.switchTab({
+                        url:'/pages/order/index'
+                    })
+
                 })
             }
 

pages/order/index.vue

@@ -22,7 +22,7 @@
 		</u-sticky>
 
 		<!-- 订单列表 -->
-		<view :style="{'height':windowHeight}" v-if="currentTab === 0" class="bord">
+		<view :style="{'height':windowHeight}" v-if="currentTab === 0">
 			<swiper :style="{'height':windowHeight}" :current="tabIndex" @change="swiperChange">
 				<swiper-item class="swiperItem" v-for="(item,index) in tabList" :key="index">
 					<view>
@@ -90,7 +90,7 @@
 			return {
 				num: 0,
 				title: 'Hello',
-				tabIndex: 3,
+				tabIndex: 0,
 				currentTab: 0,
 				currentServiceTab: 'orderTab1',
 

pages/order/module/mescrollUni-item.vue

@@ -234,14 +234,20 @@
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
 
+				let status = this.index
+				if (this.index === 3){
+					status = 4
+				}
+
 				//联网加载数据
 				let httpData = {
 					pageNum: page.num,
 					pageSize: 10,
-					type: this.index
+					orderType:'SERVICE',
+					status:status
 				}
 
-				this.$api.getMyCouponList(httpData).then((res) => {
+				this.$api.getOrderList(httpData).then((res) => {
 					//联网成功的回调,隐藏下拉刷新和上拉加载的状态;
 					this.mescroll.endSuccess(res.data.rows.length, res.data.rows.length === 10);
 					//设置列表数据