修改

pagesMy/buyExamine/index.vue

@@ -258,7 +258,8 @@
 				let res;
 				// 查询状态
 				res = await that.$api(`/DictData`, 'GET', {
-					type: 'order_status'
+					type: 'order_status',
+					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 				// 查询角色

pagesMy/collectionExamin/index.vue

@@ -258,7 +258,8 @@
 				let res;
 				// 查询状态
 				res = await that.$api(`/DictData`, 'GET', {
-					type: 'order_status'
+					type: 'order_status',
+					is_use: '0',
 				})
 				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
 				// 查询角色

pagesMy/order/index.vue

@@ -243,21 +243,35 @@
 					content: '确定申请维修该商品吗?',
 					success: async function(res) {
 						if (res.confirm) {
-							console.log('维修');
-							// 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'
-							// 	})
-							// }
+							let obj = {
+								order_id: item._id,
+								user: item.user,
+								user_name: item.user_name,
+								good: item.goods,
+								good_name: item.good_name,
+								good_file: [item.good_file],
+								spec: item.spec,
+								spec_name: item.spec_name,
+								spec_file: [item.spec_file],
+								supplier: item.supplier_id,
+								supplier_name: item.supplier_name,
+								address: item.address,
+								apply_time: moment().format('YYYY-MM-DD HH:mm:ss')
+							}
+							const res = await that.$api(`/Upkeep`, 'POST', obj);
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: '维护信息成功',
+									icon: 'none'
+								})
+								that.clearPage()
+								that.search()
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none'
+								})
+							}
 						}
 					}
 				});

pagesMy/repair/index.vue

@@ -1,37 +1,387 @@
-<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>
+<template>
+	<view class="content">
+		<view class="one">
+			<input type="text" v-model="searchInfo.good_name" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+				<view class="list-scroll-view">
+					<view class="list" v-for="(item,index) in list" :key="index" @tap="toInfo(item)">
+						<view class="list_1">
+							<text>
+								<text class="iconfont icon-changshangguanli"></text>
+								{{item.supplier_name}}
+							</text>
+							<text class="status">{{item.zhStatus}}</text>
+						</view>
+						<view class="list_2">
+							<view class="left">
+								<image v-if="item.spec_file" class="image" :src="item.spec_file?item.spec_file.url:''"
+									mode="">
+								</image>
+								<image v-else class="image" :src="item.good_file?item.good_file.url:''" mode="">
+								</image>
+							</view>
+							<view class="right">
+								<view class="right_1">
+									<view class="name textOver">
+										<text>{{item.good_name||'暂无'}}</text>
+									</view>
+									<view class="num">
+										<text>￥{{item.total_money||'0'}}</text>
+										<text>×{{item.num||'0'}}</text>
+									</view>
+								</view>
+								<view class="right_2">
+									<view class="spec textOver">
+										<text>规格：</text>
+										<text>{{item.spec_name||'暂无'}}</text>
+									</view>
+									<view class="spec textOver">
+										<text>购买用户：</text>
+										<text>{{item.user_name||'暂无'}}</text>
+									</view>
+									<view class="spec textOver">
+										<text>用户角色：</text>
+										<text>{{item.zhRole||'暂无'}}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="bottom">
+							<button size="mini" type="default" @tap.stop="toExam(item,'0')">审批通过</button>
+							<button size="mini" type="warn" @tap.stop="toExam(item,'1')">审批拒绝</button>
+						</view>
+					</view>
+					<view class="is_bottom" v-if="is_bottom">
+						<text>{{config.bottom_title}}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 系统设置
+				config: {},
+				user: {},
+				searchInfo: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
+				roleList: []
+			}
+		},
+		onLoad: function(e) {
+			const that = this;
+			that.searchConfig();
+		},
+		onShow: async function(e) {
+			const that = this;
+			await that.searchOther();
+			that.searchToken();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
+		},
+		methods: {
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						that.$set(that, `user`, res);
+						that.clearPage();
+						that.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					user: user._id
+				};
+				let res;
+				res = await that.$api(`/Upkeep`, 'GET', {
+					...info,
+					...that.searchInfo
+				});
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						val.zhStatus = that.searchDict(val.status, 'status')
+					}
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			// 查看详情
+			toInfo(e) {
+				uni.navigateTo({
+					url: `/pagesMy/order/detail?id=${e.id||e._id}`
+				})
+			},
+			// 查询字典表
+			searchDict(e, model) {
+				const that = this;
+				let data
+				if (model == 'status') {
+					data = that.statusList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				}
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			// 触底
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.good_name) that.$set(that.searchInfo, `good_name`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 审批
+			async toExam(item, type) {
+				const that = this;
+				let user = that.user;
+				let obj = {};
+				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'
+								})
+							}
+						}
+					}
+				});
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'upkeep',
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			padding: 2vw;
+
+			input {
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			background-color: var(--f9Color);
+
+			.list {
+				background-color: #fff;
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw 0;
+					font-size: var(--font16Size);
+
+					.status {
+						font-size: var(--font14Size);
+						color: var(--fF0Color);
+					}
+				}
+
+				.list_2 {
+					display: flex;
+
+					.left {
+						.image {
+							width: 20vw;
+							height: 20vw;
+							border-radius: 5px;
+							border: 1px solid var(--f9Color);
+						}
+					}
+
+					.right {
+						width: 70vw;
+						margin: 0 0 0 2vw;
+
+						.right_1 {
+							display: flex;
+							justify-content: space-between;
+							margin: 2vw 0;
+
+							.name {
+								font-size: var(--font14Size);
+							}
+
+							.num {
+								display: flex;
+								flex-direction: column;
+								align-items: flex-end;
+
+								text:last-child {
+									font-size: var(--font13Size);
+									color: var(--f85Color);
+								}
+							}
+						}
+
+						.right_2 {
+							font-size: var(--font12Size);
+
+							.spec {
+								text:first-child {
+									color: var(--f85Color);
+								}
+							}
+						}
+					}
+				}
+
+				.bottom {
+					text-align: center;
+					padding: 1vw 0;
+
+					button {
+						margin: 0 5px 0 0;
+					}
+				}
+			}
+		}
+	}
+
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		width: 100%;
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
+	}
+</style>

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

@@ -510,7 +510,8 @@ var _default = {
                 that = _this3;
                 _context6.next = 3;
                 return that.$api("/DictData", 'GET', {
-                  type: 'order_status'
+                  type: 'order_status',
+                  is_use: '0'
                 });
               case 3:
                 res = _context6.sent;

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

@@ -510,7 +510,8 @@ var _default = {
                 that = _this3;
                 _context6.next = 3;
                 return that.$api("/DictData", 'GET', {
-                  type: 'order_status'
+                  type: 'order_status',
+                  is_use: '0'
                 });
               case 3:
                 res = _context6.sent;

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

@@ -357,28 +357,48 @@ var _default = {
         content: '确定申请维修该商品吗?',
         success: function () {
           var _success3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(res) {
+            var obj, _res3;
             return _regenerator.default.wrap(function _callee8$(_context8) {
               while (1) {
                 switch (_context8.prev = _context8.next) {
                   case 0:
-                    if (res.confirm) {
-                      console.log('维修');
-                      // 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'
-                      // 	})
-                      // }
+                    if (!res.confirm) {
+                      _context8.next = 6;
+                      break;
                     }
-                  case 1:
+                    obj = {
+                      order_id: item._id,
+                      user: item.user,
+                      user_name: item.user_name,
+                      good: item.goods,
+                      good_name: item.good_name,
+                      good_file: [item.good_file],
+                      spec: item.spec,
+                      spec_name: item.spec_name,
+                      spec_file: [item.spec_file],
+                      supplier: item.supplier_id,
+                      supplier_name: item.supplier_name,
+                      address: item.address,
+                      apply_time: moment().format('YYYY-MM-DD HH:mm:ss')
+                    };
+                    _context8.next = 4;
+                    return that.$api("/Upkeep", 'POST', obj);
+                  case 4:
+                    _res3 = _context8.sent;
+                    if (_res3.errcode == '0') {
+                      uni.showToast({
+                        title: '维护信息成功',
+                        icon: 'none'
+                      });
+                      that.clearPage();
+                      that.search();
+                    } else {
+                      uni.showToast({
+                        title: _res3.errmsg,
+                        icon: 'none'
+                      });
+                    }
+                  case 6:
                   case "end":
                     return _context8.stop();
                 }

unpackage/dist/dev/mp-weixin/pagesMy/repair/index.wxss

@@ -1,12 +1,105 @@
-
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
 .content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.content .one {
+  padding: 2vw;
+}
+.content .one input {
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.content .two {
+  position: relative;
+  flex-grow: 1;
+  background-color: var(--f9Color);
+}
+.content .two .list {
+  background-color: #fff;
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.content .two .list .list_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  font-size: var(--font16Size);
+}
+.content .two .list .list_1 .status {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
+.content .two .list .list_2 {
+  display: flex;
+}
+.content .two .list .list_2 .left .image {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 5px;
+  border: 1px solid var(--f9Color);
+}
+.content .two .list .list_2 .right {
+  width: 70vw;
+  margin: 0 0 0 2vw;
+}
+.content .two .list .list_2 .right .right_1 {
+  display: flex;
+  justify-content: space-between;
+  margin: 2vw 0;
+}
+.content .two .list .list_2 .right .right_1 .name {
+  font-size: var(--font14Size);
+}
+.content .two .list .list_2 .right .right_1 .num {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+}
+.content .two .list .list_2 .right .right_1 .num text:last-child {
+  font-size: var(--font13Size);
+  color: var(--f85Color);
+}
+.content .two .list .list_2 .right .right_2 {
+  font-size: var(--font12Size);
+}
+.content .two .list .list_2 .right .right_2 .spec text:first-child {
+  color: var(--f85Color);
+}
+.content .two .list .bottom {
+  text-align: center;
+  padding: 1vw 0;
+}
+.content .two .list .bottom button {
+  margin: 0 5px 0 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.is_bottom {
+  width: 100%;
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
 }