Merge branch '红色' into 测试

# Conflicts:
#	packageA/market/detail.wxml

packageA/market/detail.wxml

@@ -53,38 +53,52 @@
       <view wx:if="{{detail.model}}" class="row">
         {{language['型号']||'型号'}}：{{detail.model || ' --'}}
       </view>
-      <block wx:if="{{siteid=='HY'}}">
+
+      <block wx:if="{{siteid == 'HY'}}">
+        <view class="row">
+          {{language['公称通径']||'公称通径'}}：{{detail.itemextend[0].caliber || ' --'}}
+        </view>
+        <view class="row">
+          {{language['公称压力']||'公称压力'}}：{{detail.itemextend[0].nominalpressure || ' --'}}
+        </view>
+        <view class="row">
+          {{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}
+        </view>
         <view class="row">
-          {{language['公称通径']||'公称通径'}}：{{detail.caliber || ' --'}}
+          {{language['执行器类型']||'执行器类型'}}：{{detail.itemextend[0].actuatortype || ' --'}}
         </view>
         <view class="row">
-          {{language['公称压力']||'公称压力'}}：{{detail.nominalpressure || ' --'}}
+          {{language['执行器品牌']||'执行器品牌'}}：{{detail.itemextend[0].actuatorbrand || ' --'}}
         </view>
       </block>
-      <view wx:if="{{detail.itemextend[0].material}}" class="row">
-        {{language['材质']||'材质'}}：{{detail.itemextend[0].material || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].device}}" class="row">
-        {{language['装置']||'装置'}}：{{detail.itemextend[0].device || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].pressure}}" class="row">
-        {{language['压力等级']||'压力等级'}}：{{detail.itemextend[0].pressure || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].prodline}}" class="row">
-        {{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].connection}}" class="row">
-        {{language['连接形式']||'连接形式'}}：{{detail.itemextend[0].connection || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].valveplatematerial}}" class="row">
-        {{language['阀板材质']||'阀板材质'}}：{{detail.itemextend[0].valveplatematerial || ' --'}}
-      </view>
-      <view wx:if="{{detail.itemextend[0].specalnote}}" class="row">
-        {{language['特殊说明']||'特殊说明'}}：{{detail.itemextend[0].specalnote || ' --'}}
-      </view>
+
+      <block wx:else>
+        <view wx:if="{{detail.itemextend[0].material}}" class="row">
+          {{language['材质']||'材质'}}：{{detail.itemextend[0].material || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].device}}" class="row">
+          {{language['装置']||'装置'}}：{{detail.itemextend[0].device || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].pressure}}" class="row">
+          {{language['压力等级']||'压力等级'}}：{{detail.itemextend[0].pressure || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].prodline}}" class="row">
+          {{language['产线']||'产线'}}：{{detail.itemextend[0].prodline || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].connection}}" class="row">
+          {{language['连接形式']||'连接形式'}}：{{detail.itemextend[0].connection || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].valveplatematerial}}" class="row">
+          {{language['阀板材质']||'阀板材质'}}：{{detail.itemextend[0].valveplatematerial || ' --'}}
+        </view>
+        <view wx:if="{{detail.itemextend[0].specalnote}}" class="row">
+          {{language['特殊说明']||'特殊说明'}}：{{detail.itemextend[0].specalnote || ' --'}}
+        </view>
+      </block>
+
     </view>
   </van-tab>
-  <van-tab title="{{language['产品资料']||'产品资料'}}">
+  <van-tab title="{{language[siteid=='HY'?'技术资料':'产品资料'] || siteid=='HY'?'技术资料':'产品资料'}}">
     <Yl_Empty wx:if="{{detail.technicalinfo.length==0}}" />
     <view wx:else class="document-box">
       <navigator class="document" url="#" wx:for="{{detail.technicalinfo}}" wx:key="index" bindtap="openDocument" data-item="{{item}}">{{item.document}}</navigator>

packageA/market/index.js

@@ -28,7 +28,7 @@ Page({
 		this.getNum();
 		this.getTradefie();
 		this.getOptionTypeSelect();
-		getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+		getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
 	},
 	/* 业务员选择角色 */
 	selsectedRole(e) {
@@ -211,11 +211,12 @@ Page({
 			content
 		}).then(res => {
 			console.log("营销类别", res)
+			let siteid = wx.getStorageSync('userMsg').siteid;
 			if (res.data[0].ttemclass) {
 				res.data[0].ttemclass.unshift({
 					itemclassid: "",
-					itemclassfullname: "全部",
-					itemclassname: "全部",
+					itemclassfullname: siteid == 'HY' ? '营销类别' : "全部",
+					itemclassname: siteid == 'HY' ? '营销类别' : "全部",
 					subdep: []
 				})
 				this.setData({

packageA/market/modules/tabs/index.wxml

@@ -1,4 +1,4 @@
-<scroll-view class="scroll-box" scroll-x scroll-left='{{scrollLeft}}' scroll-with-animation enable-passive enhanced show-scrollbar='{{false}}'>
+<scroll-view wx:if="{{list.length > 2}}" class="scroll-box" scroll-x scroll-left='{{scrollLeft}}' scroll-with-animation enable-passive enhanced show-scrollbar='{{false}}'>
 	<view class="box box-class">
 		<view wx:for="{{list}}" class="item tab-class {{active==index?'active active-class':''}}" id='{{"active"+index}}' wx:key="index" data-item="{{item}}" data-index="{{index}}" bindtap="onClick">
 			{{language[item[name]]||item[name]}}