Browse Source

修改小程序

zs 1 year ago
parent
commit
07c7252c7c
46 changed files with 190 additions and 96 deletions
  1. 33 1
      pagesMy/order/index.vue
  2. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  3. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  44. 76 10
      unpackage/dist/dev/mp-weixin/pagesMy/order/index.js
  45. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/order/index.wxml
  46. 38 42
      unpackage/dist/dev/mp-weixin/project.config.json

+ 33 - 1
pagesMy/order/index.vue

@@ -44,6 +44,8 @@
 								<view class="bottom">
 									<button v-if="item.status=='5'" size="mini" type="default"
 										@tap.stop="toConfirm(item)">确认发货</button>
+										<button v-if="item.status=='-2'||item.status=='-2'" size="mini" type="default"
+											@tap.stop="toExam(item)">重新申请购买</button>
 								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
@@ -200,6 +202,36 @@
 					}
 				});
 			},
+			// 重新审批
+			async toExam(item) {
+				const that = this;
+				let user = that.user;
+				let obj = {
+					status: '0'
+				};
+				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(e) {
 				uni.navigateTo({
@@ -252,7 +284,7 @@
 				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 == '-2'|| i.value == '-3';
 					});
 					var menu = status.map((item) => {
 						return {

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/shop/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


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

@@ -282,6 +282,72 @@ var _default = {
         }, _callee5);
       }))();
     },
+    // 重新审批
+    toExam: function toExam(item) {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
+        var that, user, obj;
+        return _regenerator.default.wrap(function _callee7$(_context7) {
+          while (1) {
+            switch (_context7.prev = _context7.next) {
+              case 0:
+                that = _this3;
+                user = that.user;
+                obj = {
+                  status: '0'
+                };
+                uni.showModal({
+                  title: '提示',
+                  content: '确定重新申请该订单吗?',
+                  success: function () {
+                    var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(res) {
+                      var _res2;
+                      return _regenerator.default.wrap(function _callee6$(_context6) {
+                        while (1) {
+                          switch (_context6.prev = _context6.next) {
+                            case 0:
+                              if (!res.confirm) {
+                                _context6.next = 5;
+                                break;
+                              }
+                              _context6.next = 3;
+                              return that.$api("/OrderDetail/".concat(item._id), 'POST', obj);
+                            case 3:
+                              _res2 = _context6.sent;
+                              if (_res2.errcode == '0') {
+                                uni.showToast({
+                                  title: '维护信息成功',
+                                  icon: 'none'
+                                });
+                                that.clearPage();
+                                that.search();
+                              } else {
+                                uni.showToast({
+                                  title: _res2.errmsg,
+                                  icon: 'none'
+                                });
+                              }
+                            case 5:
+                            case "end":
+                              return _context6.stop();
+                          }
+                        }
+                      }, _callee6);
+                    }));
+                    function success(_x3) {
+                      return _success2.apply(this, arguments);
+                    }
+                    return success;
+                  }()
+                });
+              case 4:
+              case "end":
+                return _context7.stop();
+            }
+          }
+        }, _callee7);
+      }))();
+    },
     // 查看详情
     toInfo: function toInfo(e) {
       uni.navigateTo({
@@ -323,25 +389,25 @@ var _default = {
     },
     // 查询其他信息
     searchOther: function searchOther() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
         var that, res, status, menu;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee8$(_context8) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context8.prev = _context8.next) {
               case 0:
-                that = _this3;
-                _context6.next = 3;
+                that = _this4;
+                _context8.next = 3;
                 return that.$api("/DictData", 'GET', {
                   type: 'order_status',
                   is_use: '0'
                 });
               case 3:
-                res = _context6.sent;
+                res = _context8.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 == '-2' || i.value == '-3';
                   });
                   menu = status.map(function (item) {
                     return {
@@ -357,10 +423,10 @@ var _default = {
                 }
               case 5:
               case "end":
-                return _context6.stop();
+                return _context8.stop();
             }
           }
-        }, _callee6);
+        }, _callee8);
       }))();
     },
     // 选择选项卡

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMy/order/index.wxml


+ 38 - 42
unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,43 +1,39 @@
-{
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx23c71bee5876d1b9",
-  "projectname": "test",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": 0,
-      "list": [
-        {
-          "name": "系统首页",
-          "query": "",
-          "id": 0,
-          "pathName": "pages/index/index"
-        }
-      ]
-    }
-  }
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "compileType": "miniprogram",
+  "libVersion": "",
+  "appid": "wx23c71bee5876d1b9",
+  "projectname": "test",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "系统首页",
+          "pathName": "pages/index/index",
+          "query": ""
+        }
+      ]
+    }
+  },
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }