Merge branch '黄色' into 测试

# Conflicts:
#	packageA/market/detail.wxml

packageA/market/detail.wxml

@@ -56,10 +56,10 @@
 
       <block wx:if="{{siteid == 'HY'}}">
         <view class="row">
-          {{language['公称通径']||'公称通径'}}：{{detail.itemextend[0].caliber || ' --'}}
+          {{language['公称通径']||'公称通径'}}：{{detail.caliber||detail.itemextend[0].caliber || ' --'}}
         </view>
         <view class="row">
-          {{language['公称压力']||'公称压力'}}：{{detail.itemextend[0].nominalpressure || ' --'}}
+          {{language['公称压力']||'公称压力'}}：{{detail.nominalpressure||detail.itemextend[0].nominalpressure || ' --'}}
         </view>
         <view class="row">
           {{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}

packageA/market/index.js

@@ -174,6 +174,12 @@ Page({
 				icon: "none"
 			});
 			if (res.data.length != 0) {
+				let obj = {
+					brandname: "全部品牌",
+					rowindex: 1,
+					sa_brandid: 6,
+				}
+				res.data.unshift(obj)
 				this.setData({
 					brandList: res.data,
 				});
@@ -182,7 +188,7 @@ Page({
 			} else {
 				getApp().globalData.Language.showToast('未查询到授权品牌')
 				this.setData({
-					brandList: [],
+					brandList: [obj],
 					loading: false,
 					list: [],
 					typeList: []

packageA/market/index.wxml

@@ -10,11 +10,11 @@
 	</view>
 </view>
 <!-- 标准列表 -->
-<Tabs list="{{standardList}}" wx:if="{{standardList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='standard' bind:onChange="standardChange" />
+<Tabs list="{{standardList}}" wx:if="{{standardList.length>2}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='standard' bind:onChange="standardChange" />
 <!-- 领域列表 -->
-<Tabs list="{{tradefieList}}" wx:if="{{tradefieList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />
+<Tabs list="{{tradefieList}}" wx:if="{{tradefieList.length>2}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />
 <!-- 品牌列表 -->
-<Tabs list="{{brandList}}" wx:if="{{brandList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' bind:onChange="brandChange" />
+<Tabs list="{{brandList}}" wx:if="{{brandList.length>2}}" 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" />