修改购物车

pages.json

@@ -31,12 +31,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "pages/procure/index",
-			"style": {
-				"navigationBarTitleText": "采购"
-			}
-		},
 		{
 			"path": "pages/market/index",
 			"style": {
@@ -68,6 +62,12 @@
 						"enablePullDownRefresh": true
 					}
 				},
+				{
+					"path": "order/deatil",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
 				{
 					"path": "repair/index",
 					"style": {

pages/market/index.vue

@@ -246,7 +246,8 @@
 			},
 			// 删除, 接口,购物车删除,然后将该数据移除
 			async toDel(e) {
-				let list = this.list;
+				const that = this;
+				let list = that.list;
 				let goodsList = [];
 				uni.showModal({
 					title: '提示',
@@ -254,17 +255,11 @@
 					success: async (res) => {
 						if (!res.confirm) return
 						if (e?.cart_id) {
-							const result = await this.$api(`/Cart/${e.cart_id}`, 'Delete');
+							const result = await that.$api(`/Cart/${e.cart_id}`, 'Delete');
 							if (result.errcode === 0) {
-								goodsList = list.map(i => ({
-									...i,
-									list: i.list.filter(f => f.cart_id !== e.cart_id)
-								}))
-								this.$set(this, `list`, goodsList);
-								// 检查店铺内是否还有商品
-								this.checkShopGoodsExist();
+								that.searchMarket();
 								// 计算总额
-								this.countMoney();
+								that.countMoney();
 							}
 						} else {
 							let cartIds = [];
@@ -273,30 +268,18 @@
 									if (s.check) cartIds.push(s.cart_id)
 								}
 							}
-							for (let val of cartIds) {
-								const result = await this.$api(`/Cart/${val}`, 'Delete');
-								if (result.errcode === 0) {
-									goodsList = list.map(i => ({
-										...i,
-										list: i.list.filter(f => f.cart_id !== val)
-									}))
-									this.$set(this, `list`, goodsList);
-									// 检查店铺内是否还有商品
-									this.checkShopGoodsExist();
-									// 计算总额
-									this.countMoney();
-								}
+							const result = await that.$api(`/Cart/deleteMany`, 'Delete', {
+								cartIds
+							});
+							if (result.errcode === 0) {
+								that.searchMarket();
+								// 计算总额
+								that.countMoney();
 							}
 						}
 					}
 				});
 			},
-			//检查店铺内是否还有商品
-			checkShopGoodsExist() {
-				const that = this;
-				const list = that.list.filter(f => f.list && f.list.length > 0)
-				that.$set(that `list`, list);
-			},
 			// 计算总额
 			countMoney() {
 				const that = this;

pages/procure/index.vue

@@ -1,38 +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>

pagesMy/buyExamine/index.vue

@@ -290,9 +290,10 @@
 					display: flex;
 					justify-content: space-between;
 					padding: 2vw 0;
-					font-size: var(--font14Size);
-
+					font-size: var(--font16Size);
+				
 					.status {
+						font-size: var(--font14Size);
 						color: var(--fF0Color);
 					}
 				}

pagesMy/collectionExamin/index.vue

@@ -240,7 +240,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);
 			},
@@ -290,9 +291,10 @@
 					display: flex;
 					justify-content: space-between;
 					padding: 2vw 0;
-					font-size: var(--font14Size);
-
+					font-size: var(--font16Size);
+				
 					.status {
+						font-size: var(--font14Size);
 						color: var(--fF0Color);
 					}
 				}

pagesMy/order/deatil.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

pagesMy/order/index.vue

@@ -243,7 +243,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);
@@ -309,7 +310,7 @@
 				height: 82vh;
 
 				.list {
-					background-color: #fff;
+					background-color: var(--mainColor);
 					border: 1px solid var(--f5Color);
 					padding: 2vw;
 					margin: 0 2vw 2vw 2vw;
@@ -319,9 +320,10 @@
 						display: flex;
 						justify-content: space-between;
 						padding: 2vw 0;
-						font-size: var(--font14Size);
-
+						font-size: var(--font16Size);
+					
 						.status {
+							font-size: var(--font14Size);
 							color: var(--fF0Color);
 						}
 					}

pagesMy/order/order.vue

@@ -229,7 +229,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/user/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="one">
-			<input type="text" v-model="searchInfo.goods" @input="toInput" placeholder="搜索商品">
+			<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索用户姓名">
 		</view>
 		<view class="two">
 			<tabs :tabs="tabs" @tabsChange="tabsChange">
@@ -21,6 +21,22 @@
 										<text>联系电话：</text>
 										<text>{{item.tel||'暂无'}}</text>
 									</view>
+									<view class="other">
+										<text>性别：</text>
+										<text>{{item.zhGender||'暂无'}}</text>
+									</view>
+									<view class="other">
+										<text>角色：</text>
+										<text>{{item.zhRole||'暂无'}}</text>
+									</view>
+									<view class="other">
+										<text>所属街道：</text>
+										<text>{{item.zhStreet||'暂无'}}</text>
+									</view>
+									<view class="other">
+										<text>所属社区：</text>
+										<text>{{item.zhCommunity||'暂无'}}</text>
+									</view>
 								</view>
 								<view class="bottom" v-if="item.status=='0'">
 									<button size="mini" type="default" @tap.stop="toExam(item,'0')">审核通过</button>
@@ -65,6 +81,9 @@
 				scrollTop: 0,
 				// 字典表
 				statusList: [],
+				genderList: [],
+				roleList: [],
+				benlongList: []
 			}
 		},
 		onLoad: function(e) {
@@ -132,7 +151,11 @@
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
 					for (let val of list) {
-						val.zhStatus = that.searchStatus(val.status)
+						val.zhStatus = that.searchDict(val.status, 'status')
+						val.zhGender = that.searchDict(val.gender, 'gender')
+						val.zhRole = that.searchDict(val.role, 'role')
+						val.zhStreet = that.searchDict(val.street, 'street')
+						val.zhCommunity = that.searchDict(val.community, 'community')
 					}
 					that.$set(that, `list`, list);
 					that.$set(that, `total`, res.total)
@@ -143,12 +166,31 @@
 					})
 				}
 			},
-			// 查询状态
-			searchStatus(e) {
+			// 转换字典表
+			searchDict(e, model) {
 				const that = this;
-				let data = that.statusList.find((i) => i.value == e);
-				if (data) return data.label
-				else return '暂无'
+				let data;
+				if (model == 'status') {
+					data = that.statusList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else if (model == 'gender') {
+					data = that.genderList.find((i) => i.value == e);
+					if (data) return data.label
+					else return '暂无'
+				} else if (model == 'role') {
+					data = that.roleList.find((i) => i.code == e);
+					if (data) return data.name
+					else return '暂无'
+				} else if (model == 'street') {
+					data = that.benlongList.find((i) => i._id == e);
+					if (data) return data.name
+					else return '暂无'
+				} else if (model == 'community') {
+					data = that.benlongList.find((i) => i._id == e);
+					if (data) return data.name
+					else return '暂无'
+				}
 			},
 			// 确认发货
 			async toExam(item, type) {
@@ -213,7 +255,7 @@
 			// 输入框
 			toInput(e) {
 				const that = this;
-				if (that.searchInfo.goods) that.$set(that.searchInfo, `goods`, e.detail.value)
+				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
 				else that.$set(that, `searchInfo`, {})
 				that.clearPage();
 				that.search();
@@ -224,7 +266,8 @@
 				let res;
 				// 查询状态
 				res = await that.$api(`/DictData`, 'GET', {
-					type: 'status'
+					type: 'status',
+					is_use: '0'
 				})
 				if (res.errcode == '0') {
 					that.$set(that, `statusList`, res.data);
@@ -236,6 +279,22 @@
 					})
 					that.$set(that.tabs, `menu`, menu)
 				}
+				// 性别
+				res = await that.$api(`/DictData`, 'GET', {
+					type: 'gender',
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `genderList`, res.data);
+				// 角色
+				res = await that.$api(`/Role`, 'GET', {
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `roleList`, res.data);
+				// 街道/社区
+				res = await that.$api(`/Office`, 'GET', {
+					is_use: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `benlongList`, res.data);
 			},
 			// 选择选项卡
 			tabsChange(e) {
@@ -296,9 +355,10 @@
 						display: flex;
 						justify-content: space-between;
 						padding: 2vw 0;
-						font-size: var(--font14Size);
+						font-size: var(--font16Size);
 
 						.status {
+							font-size: var(--font14Size);
 							color: var(--fF0Color);
 						}
 					}

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

@@ -5,7 +5,6 @@
     "pages/register/index",
     "pages/home/index",
     "pages/good/index",
-    "pages/procure/index",
     "pages/market/index",
     "pages/my/index"
   ],
@@ -15,6 +14,7 @@
       "pages": [
         "order/index",
         "order/order",
+        "order/deatil",
         "repair/index",
         "account/index",
         "account/info",

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 */ 259))
+      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))
     },
     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 */ 270))
+      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))
     },
     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 */ 277))
+      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))
     }
   }
 } catch (e) {

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 */ 219))
+      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))
     },
     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 */ 228))
+      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))
     },
     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 */ 235))
+      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))
     }
   }
 } catch (e) {

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

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

unpackage/dist/dev/mp-weixin/pages/procure/index.wxml

@@ -1 +0,0 @@
-<view class="content"><view class="text-area"><text class="title">{{title}}</text></view></view>

unpackage/dist/dev/mp-weixin/pages/procure/index.wxss

@@ -1,13 +0,0 @@
-
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
-}
-
-

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 */ 219))
+      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))
     },
     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 */ 228))
+      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))
     },
     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 */ 235))
+      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))
     },
     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 */ 242))
+      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))
     },
     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 */ 252))
+      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))
     }
   }
 } catch (e) {

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

@@ -32,9 +32,10 @@
   display: flex;
   justify-content: space-between;
   padding: 2vw 0;
-  font-size: var(--font14Size);
+  font-size: var(--font16Size);
 }
 .content .two .list .list_1 .status {
+  font-size: var(--font14Size);
   color: var(--fF0Color);
 }
 .content .two .list .list_2 {

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

@@ -32,9 +32,10 @@
   display: flex;
   justify-content: space-between;
   padding: 2vw 0;
-  font-size: var(--font14Size);
+  font-size: var(--font16Size);
 }
 .content .two .list .list_1 .status {
+  font-size: var(--font14Size);
   color: var(--fF0Color);
 }
 .content .two .list .list_2 {

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

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="_div"></view>

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

@@ -27,7 +27,7 @@
   height: 82vh;
 }
 .content .two .tabsList .list {
-  background-color: #fff;
+  background-color: var(--mainColor);
   border: 1px solid var(--f5Color);
   padding: 2vw;
   margin: 0 2vw 2vw 2vw;
@@ -37,9 +37,10 @@
   display: flex;
   justify-content: space-between;
   padding: 2vw 0;
-  font-size: var(--font14Size);
+  font-size: var(--font16Size);
 }
 .content .two .tabsList .list .list_1 .status {
+  font-size: var(--font14Size);
   color: var(--fF0Color);
 }
 .content .two .tabsList .list .list_2 {

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

@@ -37,9 +37,10 @@
   display: flex;
   justify-content: space-between;
   padding: 2vw 0;
-  font-size: var(--font14Size);
+  font-size: var(--font16Size);
 }
 .content .two .tabsList .list .list_1 .status {
+  font-size: var(--font14Size);
   color: var(--fF0Color);
 }
 .content .two .tabsList .list .list_2 .other {