zs 1 year ago
parent
commit
bfb27c9774
95 changed files with 827 additions and 755 deletions
  1. 1 1
      pages.json
  2. 0 37
      pagesMy/order/deatil.vue
  3. 79 0
      pagesMy/order/detail.vue
  4. 1 3
      pagesMy/user/index.vue
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/good/index.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/market/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/index/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesGoods/sort/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/info.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/update.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/buyExamine/index.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/collectionExamin/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/add.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/goods/index.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/maintenance/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/deatil.js.map
  26. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/detail.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/order/order.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/record/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/repair/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/add.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/spec/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/user/index.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  48. 1 1
      unpackage/dist/dev/mp-weixin/app.json
  49. 30 30
      unpackage/dist/dev/mp-weixin/common/vendor.js
  50. 14 14
      unpackage/dist/dev/mp-weixin/components/tabs/index.js
  51. 15 15
      unpackage/dist/dev/mp-weixin/components/upload/index.js
  52. 3 3
      unpackage/dist/dev/mp-weixin/pages/home/index.js
  53. 3 3
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  54. 1 1
      unpackage/dist/dev/mp-weixin/pages/market/index.js
  55. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/index.js
  56. 0 1
      unpackage/dist/dev/mp-weixin/pages/procure/index.js
  57. 0 4
      unpackage/dist/dev/mp-weixin/pages/procure/index.json
  58. 5 5
      unpackage/dist/dev/mp-weixin/pages/register/index.js
  59. 19 19
      unpackage/dist/dev/mp-weixin/pagesGoods/index/index.js
  60. 16 16
      unpackage/dist/dev/mp-weixin/pagesGoods/sort/index.js
  61. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/account/index.js
  62. 21 21
      unpackage/dist/dev/mp-weixin/pagesMy/account/info.js
  63. 19 19
      unpackage/dist/dev/mp-weixin/pagesMy/account/update.js
  64. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/buyExamine/index.js
  65. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/collectionExamin/index.js
  66. 21 21
      unpackage/dist/dev/mp-weixin/pagesMy/goods/add.js
  67. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/goods/index.js
  68. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/maintenance/index.js
  69. 106 62
      unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.js
  70. 0 0
      unpackage/dist/dev/mp-weixin/pagesMy/order/detail.json
  71. 0 0
      unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxml
  72. 0 0
      unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxss
  73. 1 1
      unpackage/dist/dev/mp-weixin/pagesMy/order/index.js
  74. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/record/index.js
  75. 72 72
      unpackage/dist/dev/mp-weixin/pagesMy/repair/index.js
  76. 0 1
      unpackage/dist/dev/mp-weixin/pagesMy/shop/index.js
  77. 0 5
      unpackage/dist/dev/mp-weixin/pagesMy/shop/index.json
  78. 21 21
      unpackage/dist/dev/mp-weixin/pagesMy/spec/add.js
  79. 16 16
      unpackage/dist/dev/mp-weixin/pagesMy/spec/index.js
  80. 1 3
      unpackage/dist/dev/mp-weixin/pagesMy/user/index.js
  81. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js
  82. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js
  83. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js
  84. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js
  85. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js
  86. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js
  87. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.js
  88. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.js
  89. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-grid/components/uni-grid/uni-grid.js
  90. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
  91. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js
  92. 14 14
      unpackage/dist/dev/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js
  93. 15 15
      unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
  94. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js
  95. 11 11
      unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js

+ 1 - 1
pages.json

@@ -63,7 +63,7 @@
 					}
 				},
 				{
-					"path": "order/deatil",
+					"path": "order/detail",
 					"style": {
 						"navigationBarTitleText": "订单详情"
 					}

+ 0 - 37
pagesMy/order/deatil.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				title: '订单详情'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-</style>

+ 79 - 0
pagesMy/order/detail.vue

@@ -0,0 +1,79 @@
+<template>
+	<view class="content">
+		<view class="text-area">
+			<text class="title">{{title}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				user: {},
+				info: {},
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+			that.searchToken();
+			await that.searchOther();
+			await that.search();
+		},
+		methods: {
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/OrderDetail/detail/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'order_status',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
+		}
+	}
+</script>
+
+<style>
+	.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+</style>

+ 1 - 3
pagesMy/user/index.vue

@@ -225,9 +225,7 @@
 			},
 			// 查看详情
 			toInfo(e) {
-				uni.navigateTo({
-					url: `/pagesMy/order/detail?id=${e.id||e._id}`
-				})
+				console.log(e);
 			},
 			// 分页
 			toPage(e) {

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/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/deatil.js.map


File diff suppressed because it is too large
+ 1 - 0
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


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


+ 1 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -14,7 +14,7 @@
       "pages": [
         "order/index",
         "order/order",
-        "order/deatil",
+        "order/detail",
         "repair/index",
         "account/index",
         "account/info",

File diff suppressed because it is too large
+ 30 - 30
unpackage/dist/dev/mp-weixin/common/vendor.js


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


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


+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniSearchBar: function() {
-      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 257))
+      return Promise.all(/*! import() | uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue */ 259))
     },
     uniGrid: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid/uni-grid */ "uni_modules/uni-grid/components/uni-grid/uni-grid").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid/uni-grid.vue */ 268))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid/uni-grid */ "uni_modules/uni-grid/components/uni-grid/uni-grid").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid/uni-grid.vue */ 270))
     },
     uniGridItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid-item/uni-grid-item */ "uni_modules/uni-grid/components/uni-grid-item/uni-grid-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue */ 275))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-grid/components/uni-grid-item/uni-grid-item */ "uni_modules/uni-grid/components/uni-grid-item/uni-grid-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue */ 277))
     }
   }
 } catch (e) {

+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -98,13 +98,13 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 217))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 219))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 226))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 228))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 233))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 235))
     }
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/market/index.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uniNumberBox: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-number-box/components/uni-number-box/uni-number-box */ "uni_modules/uni-number-box/components/uni-number-box/uni-number-box").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue */ 282))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-number-box/components/uni-number-box/uni-number-box */ "uni_modules/uni-number-box/components/uni-number-box/uni-number-box").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue */ 284))
     }
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -98,7 +98,7 @@ var components
 try {
   components = {
     uniBadge: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 289))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-badge/components/uni-badge/uni-badge */ "uni_modules/uni-badge/components/uni-badge/uni-badge").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-badge/components/uni-badge/uni-badge.vue */ 291))
     }
   }
 } catch (e) {

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

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

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

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

+ 5 - 5
unpackage/dist/dev/mp-weixin/pages/register/index.js

@@ -98,19 +98,19 @@ var components
 try {
   components = {
     uniForms: function() {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 217))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 219))
     },
     uniFormsItem: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 226))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 228))
     },
     uniEasyinput: function() {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 233))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 235))
     },
     uniDataCheckbox: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 240))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 242))
     },
     uniDataSelect: function() {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 250))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 252))
     }
   }
 } catch (e) {

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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 106 - 62
unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.js


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


unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.wxml → unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxml


unpackage/dist/dev/mp-weixin/pagesMy/order/deatil.wxss → unpackage/dist/dev/mp-weixin/pagesMy/order/detail.wxss


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


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


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


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

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

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

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

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


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


+ 1 - 3
unpackage/dist/dev/mp-weixin/pagesMy/user/index.js

@@ -359,9 +359,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     // 查看详情
     toInfo: function toInfo(e) {
-      uni.navigateTo({
-        url: "/pagesMy/order/detail?id=".concat(e.id || e._id) });
-
+      console.log(e);
     },
     // 分页
     toPage: function toPage(e) {

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


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


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


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


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js


File diff suppressed because it is too large
+ 11 - 11
unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js