类别添加全部 添加领域筛选

packageA/market/detail.wxml

@@ -22,13 +22,13 @@
 	<view class="offer">
 		<view>
 			<text class="price">￥{{detail.gradeprice}}</text>
-			<text class="old-price">￥{{detail.oldprice}}</text>
+			<text class="old-price">￥{{detail.marketprice}}</text>
 		</view>
 		<text class="unit">单位/{{detail.unitname}}</text>
 	</view>
 	<view class="else">
-		<text>起订量:10</text>
-		<text>库存:1200 紧缺</text>
+		<text>起订量：{{detail.orderminqty}}({{detail.unitname}})</text>
+		<text>库存：{{detail.stockstatus}}</text>
 	</view>
 </view>
 <!-- 选择型号 -->
@@ -58,26 +58,7 @@
 		</view>
 	</van-tab>
 	<van-tab title="产品资料">
-		<view class="tab-box">
-			<view class="row">
-				产品手册:
-			</view>
-			<navigator class="row" url="#">
-				紫铜快接产品册-2022
-			</navigator>
-			<view class="row">
-				安装指南：
-			</view>
-			<navigator class="row" url="#">
-				紫铜快接产品册-2022
-			</navigator>
-			<view class="row">
-				安装教程：
-			</view>
-			<navigator class="row" url="#">
-				紫铜快接产品册-2022
-			</navigator>
-		</view>
+
 	</van-tab>
 </van-tabs>
 <!-- 底部 -->

packageA/market/index.js

@@ -16,7 +16,6 @@ Page({
 			},
 			sort: []
 		},
-
 		filter: [{
 			label: "标准",
 			index: null,
@@ -33,6 +32,7 @@ Page({
 		})
 		this.getBrand()
 		this.getNum();
+		this.getTradefie();
 		this.getOptionTypeSelect();
 	},
 	/* 获取系统分类 */
@@ -61,6 +61,47 @@ Page({
 	}) {
 		console.log(detail)
 	},
+	/* 获取领域 */
+	getTradefie() {
+		_Http.basic({
+			"id": 20221223141802,
+			"content": {
+				"pageNumber": 1,
+				"pageSize": 9999,
+				"where": {
+					"condition": ""
+				}
+			}
+		}, false).then(res => {
+			console.log("获取领域", res)
+			if (res.msg != '成功') {
+				res.data = [{
+					rowindex: 0,
+					subvalues: [],
+					sys_enterprise_tradefieldid: 0,
+					tradefield: "全部"
+				}]
+			} else {
+				res.data.unshift({
+					rowindex: 0,
+					subvalues: [],
+					sys_enterprise_tradefieldid: 0,
+					tradefield: "全部"
+				})
+			}
+			this.setData({
+				tradefieid: "",
+				tradefieList: res.data
+			});
+		})
+	},
+	/* 切换领域 */
+	tradefieChange(e) {
+		this.setData({
+			tradefieid: e.detail.item.tradefield == '全部' ? "" : e.detail.item.tradefield
+		})
+		this.getList(true);
+	},
 	/* 切换分类 */
 	typeChange({
 		detail
@@ -89,11 +130,16 @@ Page({
 			console.log("查询品牌", res)
 			if (res.data.length) this.setData({
 				brandList: res.data,
-				brand: res.data[0],
 			});
+			this.data.brand = res.data[0];
 			this.getTypeList();
 		})
 	},
+	/* 切换品牌 */
+	brandChange(e) {
+		this.data.brand = e.detail.item;
+		this.getTypeList();
+	},
 	/* 获取分类 */
 	getTypeList() {
 		_Http.basic({
@@ -103,13 +149,23 @@ Page({
 			}
 		}).then(res => {
 			console.log("营销类别", res)
-			if (res.data[0].ttemclass) this.setData({
-				['typeList[0]']: {
-					active: 0,
-					list: res.data[0].ttemclass
-				},
-				"cType": res.data[0].ttemclass[0]
-			});
+
+			if (res.data[0].ttemclass) {
+				res.data[0].ttemclass.unshift({
+					itemclassid: "",
+					itemclassfullname: "全部",
+					itemclassname: "全部",
+					subdep: []
+				})
+				this.setData({
+					['typeList[0]']: {
+						active: 0,
+						list: res.data[0].ttemclass
+					},
+					"cType": res.data[0].ttemclass[0],
+					loading: false
+				});
+			}
 			this.getList(true);
 		})
 	},
@@ -121,6 +177,7 @@ Page({
 		if (content.pageNumber > content.pageTotal) return;
 		content.brandids = [this.data.brand.sa_brandid];
 		content.where.itemclassid = this.data.cType.itemclassid;
+		content.where.tradefield = this.data.tradefieid;
 		_Http.basic({
 			"id": 20220926142203,
 			content

packageA/market/index.wxml

@@ -3,8 +3,11 @@
 <template is="skeleton" wx:if="{{loading}}" />
 
 <Yl_HeadNav styleType="1" sort='{{content.sort}}' bindonSearch="onSearch" />
+<!-- 领域列表 -->
+<Tabs list="{{tradefieList}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />
+
 <!-- 品牌列表 -->
-<Tabs list="{{brandList}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' />
+<Tabs list="{{brandList}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' bind:onChange="brandChange" />
 <!-- 产品列表 -->
 <Tabs wx:for="{{typeList}}" active="{{item.active}}" wx:key="{{index}}" rowIndex="{{index}}" list="{{item.list}}" bind:onChange="typeChange" name='itemclassname' box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' />
 <view class="division" />