Explorar o código

修改vin分析显示问题

chenrui %!s(int64=2) %!d(string=hai) anos
pai
achega
c286f01955
Modificáronse 2 ficheiros con 17 adicións e 6 borrados
  1. 3 1
      pages/vinAnalyse/fitProductlist.vue
  2. 14 5
      pages/vinAnalyse/shelfAnalyse.vue

+ 3 - 1
pages/vinAnalyse/fitProductlist.vue

@@ -93,7 +93,9 @@ export default {
 			shelfSn: this.shelfSn
 		};
 		this.loadData(ajaxData);
-		
+		uni.setNavigationBarTitle({
+			title:options.shelfName
+		})
 	},
 	methods: {
 		// 获取数字货架列表

+ 14 - 5
pages/vinAnalyse/shelfAnalyse.vue

@@ -30,15 +30,21 @@
 					<view class="price-all flex" v-if="selPriceShow">
 						<view class="price-item" v-if="priceList[0].checked">
 							<view>空调滤清器</view>
-							<text class="green">有适配</text>
+							<text class="green" v-if="item.airConditionerFilterFlag == '1'">有适配</text>
+							<text class="red" v-else-if="item.airConditionerFilterFlag == '2'">无适配</text>
+							<text v-else>--</text>
 						</view>
 						<view class="price-item" v-if="priceList[1].checked">
 							<view>空气滤清器</view>
-							<text class="red">无适配</text>
+							<text class="green" v-if="item.airFilterFlag == '1'">有适配</text>
+							<text class="red" v-else-if="item.airFilterFlag == '2'">无适配</text>
+							<text v-else>--</text>
 						</view>
 						<view class="price-item" v-if="priceList[2].checked">
 							<view>机油滤清器</view>
-							<text>--</text>
+							<text class="green" v-if="item.engineOilFilterFlag == 1">有适配</text>
+							<text class="red" v-else-if="item.engineOilFilterFlag == 2">无适配</text>
+							<text v-else>--</text>
 						</view>
 					</view>
 				</view>
@@ -152,12 +158,13 @@
 				pullDownRefresh:false,//下拉刷新,
 				loadText:{
 					nomore: '已显示全部'
-				}
+				},
+				shelfName:''
 			}
 		},
 		onNavigationBarButtonTap(e){
 			uni.navigateTo({
-				url:"/pages/vinAnalyse/fitProductlist?shelfSn="+this.shelfSn
+				url:"/pages/vinAnalyse/fitProductlist?shelfSn="+this.shelfSn +"&shelfName="+ this.shelfName
 			})
 		},
 		onBackPress(e) {
@@ -178,6 +185,8 @@
 		},
 		onLoad(option) {
 			this.shelfSn = option.shelfSn
+			this.shelfName = option.shelfName
+			console.log('222:',option.shelfName)
 			let ajaxData={
 				shelfSn:option.shelfSn,
 				pageNo: this.pageNo,