修改

config.js

@@ -57,12 +57,12 @@ export default {
 			role: ['jdgly'],
 			route: "pagesMy/user/index",
 		},
-		{
-			icon: "icon-zhuyuanriqingdanchaxunbeifen",
-			title: "采购清单",
-			role: ['jdgly', 'jdry', 'sqry'],
-			route: "pagesMy/shop/index",
-		},
+		// {
+		// 	icon: "icon-zhuyuanriqingdanchaxunbeifen",
+		// 	title: "采购清单",
+		// 	role: ['jdgly', 'jdry', 'sqry'],
+		// 	route: "pagesMy/shop/index",
+		// },
 		{
 			icon: "icon-shangpinguanli",
 			title: "商品管理",

pagesMy/buyExamine/index.vue

@@ -179,7 +179,7 @@
 					that.$set(that, `page`, page)
 					let skip = page * limit;
 					that.$set(that, `skip`, skip)
-					that.searchMarket();
+					that.search();
 					uni.hideLoading();
 				} else that.$set(that, `is_bottom`, true)
 			},

pagesMy/collectionExamin/index.vue

@@ -214,7 +214,7 @@
 					that.$set(that, `page`, page)
 					let skip = page * limit;
 					that.$set(that, `skip`, skip)
-					that.searchMarket();
+					that.search();
 					uni.hideLoading();
 				} else that.$set(that, `is_bottom`, true)
 			},

pagesMy/order/index.vue

@@ -43,7 +43,7 @@
 								</view>
 								<view class="bottom">
 									<button v-if="item.status=='5'" size="mini" type="default"
-										@tap.stop="toconfirm(item)">确认发货</button>
+										@tap.stop="toConfirm(item)">确认发货</button>
 								</view>
 							</view>
 							<view class="is_bottom" v-if="is_bottom">
@@ -217,7 +217,7 @@
 					that.$set(that, `page`, page)
 					let skip = page * limit;
 					that.$set(that, `skip`, skip)
-					that.searchMarket();
+					that.search();
 					uni.hideLoading();
 				} else that.$set(that, `is_bottom`, true)
 			},

pagesMy/order/order.vue

@@ -203,7 +203,7 @@
 					that.$set(that, `page`, page)
 					let skip = page * limit;
 					that.$set(that, `skip`, skip)
-					that.searchMarket();
+					that.search();
 					uni.hideLoading();
 				} else that.$set(that, `is_bottom`, true)
 			},

pagesMy/user/index.vue

@@ -1,37 +1,353 @@
 <template>
 	<view class="content">
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+		<view class="one">
+			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+		</view>
+		<view class="two">
+			<tabs :tabs="tabs" @tabsChange="tabsChange">
+				<view class="tabsList">
+					<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-yonghu"></text>
+										{{item.name}}
+									</text>
+									<text class="status">{{item.zhStatus}}</text>
+								</view>
+								<view class="list_2">
+									<view class="other">
+										<text>联系电话：</text>
+										<text>{{item.tel||'暂无'}}</text>
+									</view>
+								</view>
+								<view class="bottom" v-if="item.status=='0'">
+									<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>
+			</tabs>
 		</view>
 	</view>
 </template>
 
 <script>
+	import tabs from '../../components/tabs/index.vue';
 	export default {
+		components: {
+			tabs
+		},
 		data() {
 			return {
-				title: '用户管理'
+				// 系统设置
+				config: {},
+				user: {},
+				status: '',
+				searchInfo: {},
+				tabs: {
+					active: '0',
+					menu: []
+				},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+				// 字典表
+				statusList: [],
 			}
 		},
-		onLoad() {
-
+		onLoad: function(e) {
+			const that = this;
+			that.$set(that, `status`, e.status || '0');
+			that.$set(that.tabs, `active`, e.status || '0');
+			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.search();
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let user = that.user;
+				let status = that.status;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					street: user.street,
+					status: status,
+				}
+				let res;
+				res = await that.$api(`/User/queryInfo`, 'GET', {
+					...info,
+					...that.searchInfo
+				});
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						val.zhStatus = that.searchStatus(val.status)
+					}
+					that.$set(that, `list`, list);
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			// 查询状态
+			searchStatus(e) {
+				const that = this;
+				let data = that.statusList.find((i) => i.value == e);
+				if (data) return data.label
+				else return '暂无'
+			},
+			// 确认发货
+			async toExam(item, type) {
+				const that = this;
+				let user = that.user;
+				let obj = {}
+				if (type == '0') obj.status == '1'
+				else obj.status == '2'
+				uni.showModal({
+					title: '提示',
+					content: '是否要确认审核?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/User/${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);
+			},
+			// 分页
+			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.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询状态
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'status'
+				})
+				if (res.errcode == '0') {
+					that.$set(that, `statusList`, res.data);
+					var menu = res.data.map((item) => {
+						return {
+							title: item.label,
+							active: item.value
+						}
+					})
+					that.$set(that.tabs, `menu`, menu)
+				}
+			},
+			// 选择选项卡
+			tabsChange(e) {
+				const that = this;
+				that.$set(that.tabs, `active`, e.active)
+				that.$set(that, `status`, e.active);
+				that.clearPage();
+				that.search()
+			},
+			// 清空列表
+			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>
+<style lang="scss">
 	.content {
 		display: flex;
 		flex-direction: column;
-		align-items: center;
-		justify-content: center;
+		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);
+
+			.tabsList {
+				position: relative;
+				width: 100vw;
+				height: 82vh;
+
+				.list {
+					background-color: #fff;
+					border: 1px solid var(--f5Color);
+					padding: 2vw;
+					margin: 0 2vw 2vw 2vw;
+					border-radius: 5px;
+
+					.list_1 {
+						display: flex;
+						justify-content: space-between;
+						padding: 2vw 0;
+						font-size: var(--font14Size);
+
+						.status {
+							color: var(--fF0Color);
+						}
+					}
+
+					.list_2 {
+						.other {
+							font-size: var(--font14Size);
+
+							text:last-child {
+								color: var(--f85Color);
+							}
+						}
+
+					}
+
+					.bottom {
+						text-align: center;
+						padding: 1vw 0;
+
+						button {
+							margin: 0 5px 0 0;
+						}
+					}
+				}
+			}
+		}
 	}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
+	.scroll-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+
+		.list-scroll-view {
+			display: flex;
+			flex-direction: column;
+		}
+	}
+
+	.is_bottom {
+		text-align: center;
+
+		text {
+			padding: 2vw 0;
+			display: inline-block;
+			color: var(--f85Color);
+			font-size: var(--font14Size);
+		}
 	}
 </style>

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

@@ -3613,12 +3613,12 @@ if (system.uniPlatform == 'mp-weixin') {
     role: ['jdgly'],
     route: "pagesMy/user/index" },
 
-  {
-    icon: "icon-zhuyuanriqingdanchaxunbeifen",
-    title: "采购清单",
-    role: ['jdgly', 'jdry', 'sqry'],
-    route: "pagesMy/shop/index" },
-
+  // {
+  // 	icon: "icon-zhuyuanriqingdanchaxunbeifen",
+  // 	title: "采购清单",
+  // 	role: ['jdgly', 'jdry', 'sqry'],
+  // 	route: "pagesMy/shop/index",
+  // },
   {
     icon: "icon-shangpinguanli",
     title: "商品管理",

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

@@ -313,7 +313,7 @@ var _default =
         that.$set(that, "page", page);
         var skip = page * limit;
         that.$set(that, "skip", skip);
-        that.searchMarket();
+        that.search();
         uni.hideLoading();
       } else that.$set(that, "is_bottom", true);
     },

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

@@ -348,7 +348,7 @@ var _default =
         that.$set(that, "page", page);
         var skip = page * limit;
         that.$set(that, "skip", skip);
-        that.searchMarket();
+        that.search();
         uni.hideLoading();
       } else that.$set(that, "is_bottom", true);
     },

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

@@ -351,7 +351,7 @@ __webpack_require__.r(__webpack_exports__);
         that.$set(that, "page", page);
         var skip = page * limit;
         that.$set(that, "skip", skip);
-        that.searchMarket();
+        that.search();
         uni.hideLoading();
       } else that.$set(that, "is_bottom", true);
     },

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

@@ -337,7 +337,7 @@ var _default =
         that.$set(that, "page", page);
         var skip = page * limit;
         that.$set(that, "skip", skip);
-        that.searchMarket();
+        that.search();
         uni.hideLoading();
       } else that.$set(that, "is_bottom", true);
     },

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

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "用户管理",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "tabs": "/components/tabs/index"
+  }
 }

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

@@ -1,12 +1,78 @@
-
+@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 .tabsList {
+  position: relative;
+  width: 100vw;
+  height: 82vh;
+}
+.content .two .tabsList .list {
+  background-color: #fff;
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
+}
+.content .two .tabsList .list .list_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 0;
+  font-size: var(--font14Size);
+}
+.content .two .tabsList .list .list_1 .status {
+  color: var(--fF0Color);
+}
+.content .two .tabsList .list .list_2 .other {
+  font-size: var(--font14Size);
+}
+.content .two .tabsList .list .list_2 .other text:last-child {
+  color: var(--f85Color);
+}
+.content .two .tabsList .list .bottom {
+  text-align: center;
+  padding: 1vw 0;
+}
+.content .two .tabsList .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 {
+  text-align: center;
+}
+.is_bottom text {
+  padding: 2vw 0;
+  display: inline-block;
+  color: var(--f85Color);
+  font-size: var(--font14Size);
 }