修改

config.js

@@ -24,21 +24,21 @@ export default {
 		{
 			icon: "icon-31daifahuo",
 			title: "待发货",
-			status: "1",
+			status: "4",
 			type: "order",
 			route: "pagesMy/order/index",
 		},
 		{
 			icon: "icon-daishouhuo",
 			title: "待收货",
-			status: "2",
+			status: "5",
 			type: "order",
 			route: "pagesMy/order/index",
 		},
 		{
 			icon: "icon-transaction",
 			title: "待回款",
-			status: "3",
+			status: "7",
 			type: "order",
 			route: "pagesMy/order/index",
 		},

pagesMy/order/index.vue

@@ -41,6 +41,10 @@
 										</view>
 									</view>
 								</view>
+								<view class="bottom">
+									<button v-if="item.status=='5'" size="mini" type="default"
+										@tap.stop="toconfirm(item)">确认发货</button>
+								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
 								<text>{{config.bottom_title}}</text>
@@ -165,6 +169,36 @@
 				if (data) return data.label
 				else return '暂无'
 			},
+			// 确认发货
+			async toConfirm(item) {
+				const that = this;
+				let user = that.user;
+				let obj = {
+					status: '6'
+				}
+				uni.showModal({
+					title: '提示',
+					content: '是否要确认收货?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/OrderDetail/${item._id}`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
+						}
+					}
+				});
+			},
 			// 查看详情
 			toInfo(item) {
 				console.log(item);
@@ -214,7 +248,8 @@
 				if (res.errcode == '0') {
 					that.$set(that, `statusList`, res.data);
 					let status = res.data.filter((i) => {
-						return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6';
+						return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6' || i
+							.value == '7';
 					});
 					var menu = status.map((item) => {
 						return {

pagesMy/order/order.vue

@@ -43,7 +43,7 @@
 							</view>
 						</view>
 						<view class="bottom">
-							<button size="mini" type="default" @tap.stop="toconfirm(item)">确认发货</button>
+							<button size="mini" type="default" @tap.stop="toConfirm(item)">确认发货</button>
 						</view>
 					</view>
 					<view class="is_bottom" v-if="is_bottom">
@@ -160,7 +160,7 @@
 				else return '暂无'
 			},
 			// 确认发货
-			async toconfirm(item) {
+			async toConfirm(item) {
 				const that = this;
 				let user = that.user;
 				let obj = {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3580,21 +3580,21 @@ if (system.uniPlatform == 'mp-weixin') {
   {
     icon: "icon-31daifahuo",
     title: "待发货",
-    status: "1",
+    status: "4",
     type: "order",
     route: "pagesMy/order/index" },
 
   {
     icon: "icon-daishouhuo",
     title: "待收货",
-    status: "2",
+    status: "5",
     type: "order",
     route: "pagesMy/order/index" },
 
   {
     icon: "icon-transaction",
     title: "待回款",
-    status: "3",
+    status: "7",
     type: "order",
     route: "pagesMy/order/index" },
 

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

@@ -184,6 +184,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
 
 
 
@@ -298,6 +302,36 @@ __webpack_require__.r(__webpack_exports__);
       var data = that.statusList.find(function (i) {return i.value == e;});
       if (data) return data.label;else
       return '暂无';
+    },
+    // 确认发货
+    toConfirm: function toConfirm(item) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {var that, user, obj;return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
+                that = _this2;
+                user = that.user;
+                obj = {
+                  status: '6' };
+
+                uni.showModal({
+                  title: '提示',
+                  content: '是否要确认收货?',
+                  success: function () {var _success = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {var _res;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:if (!
+                              res.confirm) {_context4.next = 5;break;}_context4.next = 3;return (
+                                that.$api("/OrderDetail/".concat(item._id), 'POST', obj));case 3:_res = _context4.sent;
+                              if (_res.errcode == '0') {
+                                uni.showToast({
+                                  title: '维护信息成功',
+                                  icon: 'none' });
+
+                                that.clearPage();
+                                that.search();
+                              } else {
+                                uni.showToast({
+                                  title: _res.errmsg,
+                                  icon: 'none' });
+
+                              }case 5:case "end":return _context4.stop();}}}, _callee4);}));function success(_x2) {return _success.apply(this, arguments);}return success;}() });case 4:case "end":return _context5.stop();}}}, _callee5);}))();
+
+
+
     },
     // 查看详情
     toInfo: function toInfo(item) {
@@ -338,17 +372,18 @@ __webpack_require__.r(__webpack_exports__);
       that.search();
     },
     // 查询其他信息
-    searchOther: function searchOther() {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee4() {var that, res, status, menu;return _regenerator.default.wrap(function _callee4$(_context4) {while (1) {switch (_context4.prev = _context4.next) {case 0:
-                that = _this2;_context4.next = 3;return (
+    searchOther: function searchOther() {var _this3 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee6() {var that, res, status, menu;return _regenerator.default.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
+                that = _this3;_context6.next = 3;return (
 
 
                   that.$api("/DictData", 'GET', {
-                    type: 'order_status' }));case 3:res = _context4.sent;
+                    type: 'order_status' }));case 3:res = _context6.sent;
 
                 if (res.errcode == '0') {
                   that.$set(that, "statusList", res.data);
                   status = res.data.filter(function (i) {
-                    return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6';
+                    return i.value == '0' || i.value == '4' || i.value == '5' || i.value == '6' || i.
+                    value == '7';
                   });
                   menu = status.map(function (item) {
                     return {
@@ -357,7 +392,7 @@ __webpack_require__.r(__webpack_exports__);
 
                   });
                   that.$set(that.tabs, "menu", menu);
-                }case 5:case "end":return _context4.stop();}}}, _callee4);}))();
+                }case 5:case "end":return _context6.stop();}}}, _callee6);}))();
     },
     // 选择选项卡
     tabsChange: function tabsChange(e) {

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

@@ -294,7 +294,7 @@ var _default =
       return '暂无';
     },
     // 确认发货
-    toconfirm: function toconfirm(item) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {var that, user, obj;return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
+    toConfirm: function toConfirm(item) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee5() {var that, user, obj;return _regenerator.default.wrap(function _callee5$(_context5) {while (1) {switch (_context5.prev = _context5.next) {case 0:
                 that = _this2;
                 user = that.user;
                 obj = {