Browse Source

修改 跳转订单对应tab栏

liude 1 year ago
parent
commit
4d4889586a

+ 20 - 3
src/pages/client/clientPackage/orderAll.vue

@@ -56,9 +56,9 @@
 
         </view>
       </view>
-      <!-- <view v-else style="margin-top: 40rpx">
+      <view v-if='init_list.length == 0' style="margin-top: 40rpx">
         <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" />
-      </view> -->
+      </view>
     </view>
   </view>
 </template>
@@ -106,7 +106,24 @@
       };
     },
     mounted() {
-      this.userOrdersPage();
+      // this.userOrdersPage();
+    },
+    onShow(){
+      let cur = this.$store.state.order.skip_order_type.type
+      switch(cur){
+        case 0 :
+          this.current = 0
+          this.userOrdersPage(cur);
+          break;
+        case 1 :
+          this.current = 2
+          this.userOrdersPage(cur);
+          break;
+        case 2 :
+          this.current = 3
+          this.userOrdersPage(cur);
+          break;
+      }
     },
     computed:{
       allNumber(){

+ 2 - 1
src/pages/client/tabBar/mine/index.vue

@@ -119,8 +119,9 @@ export default {
 
     // 点击跳转到全部订单
     gotoOrder(item) {
+      this.$store.commit('order/GET_ORDER_TYPE',item)
       uni.navigateTo({
-        url: `/pages/client/clientPackage/orderAll?type=${item.type}`,
+        url: `/pages/client/clientPackage/orderAll`,
       });
     },
 

+ 8 - 8
src/pages/client/tabBar/mine/mine.js

@@ -29,19 +29,19 @@ export const oderList = [
   },
   {
     name: 'bag-fill',
-    title: '待付款',
+    title: '已发货',
     type: 1,
   },
   {
     name: 'car-fill',
-    title: '已付款',
+    title: '已完成',
     type: 2,
-  },
-  {
-    name: 'heart',
-    title: '待评价',
-    type: 3,
-  },
+  }
+  // {
+  //   name: 'heart',
+  //   title: '待评价',
+  //   type: 3,
+  // },
 ];
 
 export const incomeList = [

+ 8 - 3
src/store/modules/order.js

@@ -1,12 +1,17 @@
 export default{
 	namespaced:true,
 	state:{
-		order_list:null
+		order_list:null,
+    skip_order_type:{}
 	},
 	mutations:{
 		// 获取订单信息
 		GET_ORDER_LIST(state,value){
 			state.order_list = value
-		}
+		},
+    GET_ORDER_TYPE(state,value){
+      state.skip_order_type = value
+      console.log("@@@state.skip_order_type",state.skip_order_type)
+    }
 	}
-}
+}