需求大厅类目筛选增加传递后台的参数；增加两个订单列表标签；订单详情展示字段及位置调整；

common/js/request.js

@@ -15,7 +15,7 @@ export default {
 				// request 触发前拼接 url 
 				args.url = 'https://www.opsoul.com:8881' + args.url;
 				// args.url = 'http://127.0.0.1:80' + args.url;
-				// args.url = 'http://192.168.10.106:80' + args.url;
+				// args.url = 'http://192.168.10.103:80' + args.url;
 				
 				if (!args.data) {
 					args.data = {}

components/goods-card/horizontal-goods-card.vue

@@ -4,7 +4,7 @@
 		</view>
 		<view class="margin-left-sm product-content">
 			<view>
-				<view class="text-black">{{product.goodsName}}</view>
+				<view class="text-black">{{product.totalName}}</view>
 				<view class="text-sm" v-if="ifShowComments">{{product.remark}}</view>
 			</view>
 			<view class="flex justify-between align-center">
@@ -58,7 +58,7 @@
 			},
 			ifShowComments: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 			product: {
 				type: Object,

pages/demand-center/accept-demand-center.vue

@@ -38,7 +38,7 @@
 						:range="categoryList">
 						<view class="flex justify-start">
 							<view class="text-cut search-nav-item-text">
-								{{chosenCategory && chosenCategory.length ? chosenCategory[2].goodsCategoryName : item.title}}
+								{{chosenCategory && chosenCategory.length ? chosenCategory[chosenCategory.length - 1].goodsCategoryName : item.title}}
 							</view>
 							<text class="text-lg"><text class="cuIcon-triangledownfill"></text></text>
 						</view>
@@ -279,7 +279,10 @@
 				hasNotice: false,
 				workerCityIds: [],
 				workerDistrictIds: [],
-				workerStreetIds: []
+				workerStreetIds: [],
+				workerFirstCategoryIds: [],
+				workerSecondCategoryIds: [],
+				workerThirdCategoryIds: []
 			}
 		},
 		onShow() {
@@ -288,7 +291,8 @@
 		methods: {
 			async loadData() {
 				this.curUserInfo = this.$request.getCurUserInfo();
-				await this.getWorkerAreaIds();
+				this.getWorkerAreaIds();
+				await this.getWorkerDataCategoryIds();
 				// this.checkBankAndCertify();
 				// this.tasks = await this.$api.data('tasks');
 				this.reloadMasterOrderPage();
@@ -341,6 +345,28 @@
 				this.workerDistrictIds = districtIds;
 				this.workerStreetIds = streetIds;
 			},
+			async getWorkerDataCategoryIds() {
+				let res = await this.$request.getWorkerGoodsCategory({
+					workerId: this.curUserInfo.workerId
+				});
+				let firstGoodsCategoryIds = [];
+				let secondGoodsCategoryIds = [];
+				let thirdGoodsCategoryIds = [];
+				for(let i = 0; i < res.data.length; i++) {
+					if (firstGoodsCategoryIds.indexOf(res.data[i].goodsCategoryId) === -1) {
+						firstGoodsCategoryIds.push(res.data[i].goodsCategoryId)
+					}
+					if (secondGoodsCategoryIds.indexOf(res.data[i].goodsCategoryId) === -1) {
+						secondGoodsCategoryIds.push(res.data[i].goodsCategoryId)
+					}
+					if (thirdGoodsCategoryIds.indexOf(res.data[i].goodsCategoryId) === -1) {
+						thirdGoodsCategoryIds.push(res.data[i].goodsCategoryId)
+					}
+				}
+				this.workerFirstCategoryIds = firstGoodsCategoryIds;
+				this.workerSecondCategoryIds = secondGoodsCategoryIds;
+				this.workerThirdCategoryIds = thirdGoodsCategoryIds;
+			},
 			async loadMasterOrderPage(params = {}) {
 				params.pageSize = this.$globalData.initPageSize;
 				params.pageNum = this.pageNum;
@@ -355,6 +381,8 @@
 						params.params[condition.code] = condition.value === 1 ? 'desc' : 'asc';
 					}
 				})
+				
+				// 区域条件
 				params.cityIds = this.workerCityIds;
 				if (this.chosenArea.length === 1) {
 					// 选中了区列表中的全部选项
@@ -368,6 +396,22 @@
 					params.streetIds = [this.chosenArea[2].areaId];
 				}
 				
+				// 类目条件
+				params.thirdGoodsCategoryIds = this.workerThirdCategoryIds;
+				if (this.chosenCategory.length === 1) {
+					// 选了一级类目
+					params.firstGoodsCategoryIds = [this.chosenCategory[0].goodsCategoryId];
+				} else if (this.chosenCategory.length === 2) {
+					// 选了二级类目
+					params.firstGoodsCategoryIds = [this.chosenCategory[0].goodsCategoryId];
+					params.secondGoodsCategoryIds = [this.chosenCategory[1].goodsCategoryId];
+				} else if (this.chosenArea.length === 3) {
+					// 选了三级类目
+					params.firstGoodsCategoryIds = [this.chosenCategory[0].goodsCategoryId];
+					params.secondGoodsCategoryIds = [this.chosenCategory[1].goodsCategoryId];
+					params.thirdGoodsCategoryIds = [this.chosenCategory[2].goodsCategoryId];
+				}
+				
 				this.$refs.loadStatusBar.showLoading();
 				try {
 					let res = await this.$request.qryMasterOrderPage(params);
@@ -433,6 +477,20 @@
 					goodsCategoryId: col3Id
 				});
 				thirdTypeList = thirdTypeList.data;
+				
+				// 加上“全部”节点
+				subTypeList.unshift({
+					goodsCategoryName: '全部',
+					goodsCategoryId: -1
+				});
+				subSubTypeList.unshift({
+					goodsCategoryName: '全部',
+					goodsCategoryId: -1
+				});
+				thirdTypeList.unshift({
+					goodsCategoryName: '全部',
+					goodsCategoryId: -1
+				});
 				this.categoryList.push(subTypeList);
 				this.categoryList.push(subSubTypeList);
 				this.categoryList.push(thirdTypeList);
@@ -552,10 +610,14 @@
 				this.categoryMultiIndex = e.detail.value;
 				let chosenCategory = [];
 				for (let i = 0; i < this.categoryList.length; i++) {
+					if (this.categoryMultiIndex[i] === 0) {
+						// 选中了全部节点
+						break;
+					}
 					chosenCategory.push(this.categoryList[i][this.categoryMultiIndex[i]]);
 				}
 				this.chosenCategory = chosenCategory;
-				this.taskConditions[this.tabCur].value = chosenCategory[chosenCategory.length - 1].goodsCategoryId;
+				// this.taskConditions[this.tabCur].value = chosenCategory[chosenCategory.length - 1].goodsCategoryId;
 				this.searchTasks();
 			},
 			async categoryColChange(e) {
@@ -575,6 +637,15 @@
 						});
 						subSubTypeList = subSubTypeList.data;
 					}
+					// 加上“全部”节点
+					subTypeList.unshift({
+						goodsCategoryName: '全部',
+						goodsCategoryId: -1
+					});
+					subSubTypeList.unshift({
+						goodsCategoryName: '全部',
+						goodsCategoryId: -1
+					});
 					this.categoryList.pop();
 					this.categoryList.pop();
 					this.categoryList.push(subTypeList);
@@ -587,6 +658,11 @@
 						goodsCategoryId: this.categoryList[1][colObj.value].goodsCategoryId
 					});
 					subSubTypeList = subSubTypeList.data;
+					// 加上“全部”节点
+					subSubTypeList.unshift({
+						goodsCategoryName: '全部',
+						goodsCategoryId: -1
+					});
 					this.categoryList.pop();
 					this.categoryList.push(subSubTypeList);
 					this.categoryMultiIndex = [this.categoryMultiIndex[0], colObj.value, 0];

pages/order-manage/order-manage.vue

@@ -105,6 +105,10 @@
 				<view v-else-if="order.orderStatus === 4" class="right-tag padding-lr-sm padding-tb-xs bg-orange">确</view>
 				<view v-else-if="order.orderStatus === 5" class="right-tag padding-lr-sm padding-tb-xs bg-green">完</view>
 			</view>
+			<view class="float-left">
+				<view v-if="order.goodsBrand" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>{{order.goodsBrand}}</view>
+				<view v-if="order.goodsSpecification" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>{{order.goodsSpecification}}</view>
+			</view>
 			<view class="float-left">
 				<view v-if="order.payType === 1" class='cu-tag margin-right-xs radius line-main-color margin-top-xs'>到付单</view>
 				<view v-if="order.changeMoney || order.payStatus != 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>有待付款</view>

pages/order-manage/serv-detail.vue

@@ -117,6 +117,10 @@
 				<product-picked :product="servDetail" :pickedList="servDetail.standardList" :columnTitleArr="servingColumnHeaders" :valFieldArr="servingValFields"></product-picked>
 			</view>
 		</view>
+		<!-- 下单备注 -->
+		<view v-if="servDetail.remark" class="bg-white margin-lr-sm padding margin-top-sm">
+			<view>{{servDetail.remark}}</view>
+		</view>
 		<!-- 加价记录 子单详情展示 -->
 		<view v-if="servDetail.orderDetailId != null && servDetail.financialChangeRecords && servDetail.financialChangeRecords.length > 0" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
 			<view class="cu-bar solid-bottom">
@@ -558,11 +562,12 @@
 			</view>
 		</view>
 		<!-- 订单编码和时间 -->
-		<view class="bg-white margin-top-sm padding margin-lr-sm margin-bottom-with-bar">
+		<view class="bg-white margin-top-sm padding margin-lr-sm">
 			<view v-if="servDetail.orderDetailCode != null">订单编码：{{servDetail.orderDetailCode}}</view>
 			<view v-else>订单编码：{{servDetail.orderMasterCode}}</view>
 			<view class="margin-top-xs">订单时间：{{servDetail.createTime}}</view>
 		</view>
+		<view class="occupancy-bottom-bar"></view>
 		<!-- 底部操作栏 -->
 		<view class="cu-bar bg-white tabbar border fixed-bottom-bar" v-if="servDetail.orderDetailId != null && servDetail.orderStatus === 2">
 			<!-- <view class="action" data-popup="orderManage" @click="togglePopup">