修改全部订单

pages/my/index.vue

@@ -10,7 +10,7 @@
 		<view class="two">
 			<view class="two_1">
 				<view class="left">我的订单</view>
-				<view class="right" @tap="toCommon('pagesMy/order/index')">查看全部订单 <text
+				<view class="right" @tap="toCommon(`pagesMy/order/index?status=${'-1'}`)">查看全部订单 <text
 						class="iconfont icon-dayuhao"></text></view>
 			</view>
 			<view class="two_2">

pagesMy/order/index.vue

@@ -142,8 +142,8 @@
 					skip: that.skip,
 					limit: that.limit,
 					user: user._id,
-					status: status
 				}
+				if (status != '-1') info.status = status
 				let res;
 				res = await that.$api(`/OrderDetail/queryInfo`, 'GET', {
 					...info,
@@ -261,6 +261,10 @@
 							active: item.value
 						}
 					})
+					menu.unshift({
+						title: '全部',
+						active: '-1'
+					})
 					that.$set(that.tabs, `menu`, menu)
 				}
 			},
@@ -324,7 +328,7 @@
 						justify-content: space-between;
 						padding: 2vw 0;
 						font-size: var(--font16Size);
-					
+
 						.status {
 							font-size: var(--font14Size);
 							color: var(--fF0Color);
@@ -373,10 +377,11 @@
 							}
 						}
 					}
+
 					.bottom {
 						text-align: center;
 						padding: 1vw 0;
-					
+
 						button {
 							margin: 0 5px 0 0;
 						}

unpackage/dist/dev/mp-weixin/pages/procure/index.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/pages/procure/index.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "采购",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "订单详情",
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/pagesMy/order/index.js

@@ -275,13 +275,13 @@ __webpack_require__.r(__webpack_exports__);
                 info = {
                   skip: that.skip,
                   limit: that.limit,
-                  user: user._id,
-                  status: status };_context3.next = 6;return (
+                  user: user._id };
 
+                if (status != '-1') info.status = status;_context3.next = 7;return (
 
                   that.$api("/OrderDetail/queryInfo", 'GET', _objectSpread(_objectSpread({},
                   info),
-                  that.searchInfo)));case 6:res = _context3.sent;
+                  that.searchInfo)));case 7:res = _context3.sent;
 
                 if (res.errcode == '0') {
                   list = [].concat(_toConsumableArray(that.list), _toConsumableArray(res.data));_iterator = _createForOfIteratorHelper(
@@ -295,7 +295,7 @@ __webpack_require__.r(__webpack_exports__);
                     title: res.errmsg,
                     icon: 'none' });
 
-                }case 8:case "end":return _context3.stop();}}}, _callee3);}))();
+                }case 9:case "end":return _context3.stop();}}}, _callee3);}))();
     },
     // 查询状态
     searchStatus: function searchStatus(e) {
@@ -395,6 +395,10 @@ __webpack_require__.r(__webpack_exports__);
                       active: item.value };
 
                   });
+                  menu.unshift({
+                    title: '全部',
+                    active: '-1' });
+
                   that.$set(that.tabs, "menu", menu);
                 }case 5:case "end":return _context6.stop();}}}, _callee6);}))();
     },

unpackage/dist/dev/mp-weixin/pagesMy/shop/index.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/pagesMy/shop/index.json

@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "采购清单",
-  "enablePullDownRefresh": true,
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js

@@ -1 +0,0 @@
-Component({})

unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
-}