HY站点隐藏规格 添加显示 公称通径 公称压力

packageA/borrow/modules/product/list/index.js

@@ -16,6 +16,14 @@ Component({
 			type: Boolean
 		}
 	},
+	lifetimes: {
+		attached: function () {
+			this.setData({
+				siteid: wx.getStorageSync('userMsg').siteid
+			})
+			getApp().globalData.Language.getLanguagePackage(this)
+		}
+	},
 	options: {
 		addGlobalClass: true
 	},

packageA/borrow/modules/product/list/index.wxml

@@ -17,7 +17,11 @@
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
-					<text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+					<text class="line-1" wx:if="{{siteid != 'HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+				</view>
+				<view class="subfield" wx:if="{{siteid == 'HY'}}">
+					<text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||' --'}}</text>
+					<text class="line-1" style="margin-right: 6rpx;">{{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
 				</view>
 				<view class="subfield">
 					<text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>

packageA/market/detail.js

@@ -17,7 +17,8 @@ Page({
 		})
 		sa_brandid = options.sa_brandid;
 		this.setData({
-			userrole: wx.getStorageSync('userrole')
+			userrole: wx.getStorageSync('userrole'),
+			siteid: wx.getStorageSync('userMsg').siteid
 		})
 
 		if (wx.getStorageSync('userrole') == '业务员') sys_enterpriseid = options.sys_enterpriseid

packageA/market/detail.wxml

@@ -47,12 +47,20 @@
       <view class="row">
         {{language['商品编号']||'商品编号'}}：{{detail.itemno}}
       </view>
-      <view wx:if="{{detail.spec}}" class="row">
+      <view wx:if="{{siteid!='HY' && detail.spec}}" class="row">
         {{language['规格']||'规格'}}：{{detail.spec || ' --'}}
       </view>
       <view wx:if="{{detail.model}}" class="row">
         {{language['型号']||'型号'}}：{{detail.model || ' --'}}
       </view>
+      <block wx:if="{{siteid=='HY'}}">
+        <view class="row">
+          {{language['公称通径']||'公称通径'}}：{{detail.caliber || ' --'}}
+        </view>
+        <view class="row">
+          {{language['公称压力']||'公称压力'}}：{{detail.nominalpressure || ' --'}}
+        </view>
+      </block>
       <view wx:if="{{detail.itemextend[0].material}}" class="row">
         {{language['材质']||'材质'}}：{{detail.itemextend[0].material || ' --'}}
       </view>

packageA/orderForm/modules/product/list/index.js

@@ -20,6 +20,9 @@ Component({
 	},
 	lifetimes: {
 		attached: function () {
+			this.setData({
+				siteid: wx.getStorageSync('userMsg').siteid
+			})
 			getApp().globalData.Language.getLanguagePackage(this)
 		}
 	},

packageA/orderForm/modules/product/list/index.wxml

@@ -17,7 +17,11 @@
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['型号']||'型号'}}：{{language[item.model]||item.model||' --'}}</text>
-                    <text class="line-1">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+                    <text class="line-1" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||' --'}}</text>
+                </view>
+                <view class="subfield" wx:if="{{siteid=='HY'}}">
+                    <text class="line-1" style="margin-right: 6rpx;">{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||' --'}}</text>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||' --'}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['材质']||'材质'}}：{{language[item.material]||item.material||' --'}}</text>

packageA/shopping/modules/standard/index.js

@@ -27,6 +27,9 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                siteid: wx.getStorageSync('userMsg').siteid
+            })
         }
     },
     methods: {

packageA/shopping/modules/standard/index.wxml

@@ -12,7 +12,11 @@
                 <text class="iconfont icon-guanlian-shanchu" catchtap="deteleItem" data-item="{{item}}" />
             </view>
             <view class="exp">{{language['编号']||'编号'}}：{{item.itemno}}</view>
-            <view class="exp">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <view class="exp" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <block wx:else>
+                <view class="exp">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber || '--'}}</view>
+                <view class="exp">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure || '--'}}</view>
+            </block>
             <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
             <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandname]||item.brandname}}</view>
             <view class="exp">{{language['领域']||'领域'}}：{{item.tradefield_shoppingcart}}</view>

packageA/shopping/modules/tool/index.js

@@ -17,6 +17,9 @@ Component({
     lifetimes: {
         attached: function () {
             getApp().globalData.Language.getLanguagePackage(this)
+            this.setData({
+                siteid: wx.getStorageSync('userMsg').siteid
+            })
         }
     },
     data: {

packageA/shopping/modules/tool/index.wxml

@@ -12,7 +12,11 @@
                 <text class="iconfont icon-guanlian-shanchu" catchtap="deteleItem" data-item="{{item}}" />
             </view>
             <view class="exp">{{language['编号']||'编号'}}：{{item.itemno}}</view>
-            <view class="exp">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <view class="exp" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec}}</view>
+            <block wx:else>
+                <view class="exp">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber || '--'}}</view>
+                <view class="exp">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure || '--'}}</view>
+            </block>
             <view class="exp">{{language['型号']||'型号'}}：{{language[item.model]||item.model}}</view>
             <view class="exp">{{language['品牌']||'品牌'}}：{{language[item.brandName]||item.brandName||" --"}}</view>
             <view class="exp">{{language['领域']||'领域'}}：<text wx:for="{{language[item.tradefield]||item.tradefield}}" wx:key="index" wx:for-item="it">{{it.tradefield}}</text></view>

packageA/tool/modules/list/index.js

@@ -15,6 +15,9 @@ Component({
   lifetimes: {
     attached: function () {
       getApp().globalData.Language.getLanguagePackage(this)
+      this.setData({
+        siteid: wx.getStorageSync('userMsg').siteid
+      })
     }
   },
   methods: {

packageA/tool/modules/list/index.wxml

@@ -12,7 +12,8 @@
     </view>
     <view class="right-box">
         <view class="title line-1">{{item.itemname||'--'}}</view>
-        <view class="type line-1">{{language['型号']||'型号'}}：{{language[item.model]||item.model||'--'}} <text style="margin-left: 16rpx;">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||'--'}}</text></view>
+        <view class="type line-1">{{language['型号']||'型号'}}：{{language[item.model]||item.model||'--'}} <text wx:if="{{siteid!='HY'}}" style="margin-left: 16rpx;">{{language['规格']||'规格'}}：{{language[item.spec]||item.spec||'--'}}</text></view>
+        <view class="type line-1" wx:if="{{siteid == 'HY'}}">{{language['公称通径']||'公称通径'}}：{{language[item.caliber]||item.caliber||'--'}} <text style="margin-left: 16rpx;">{{language['公称压力']||'公称压力'}}：{{language[item.nominalpressure]||item.nominalpressure||'--'}}</text></view>
         <view class="tags">
             <view style="background: #FA8C16;">
                 {{language[item.brandname]||item.brandname}}

select/product/index.js

@@ -46,6 +46,9 @@ Page({
         }, ]
     },
     onLoad(options) {
+        this.setData({
+            siteid: wx.getStorageSync('userMsg').siteid
+        })
         if (options.params) {
             let params = JSON.parse(options.params);
             if (!params.content.pageNumber || !params.content.pageTotal) {
@@ -64,7 +67,7 @@ Page({
             oldPrice: options.oldprice || "oldprice" //对比老价格
         });
         this.getList()
-        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+        getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     },
     getList(init = false) {
         //init 用于初始化分页

select/product/index.wxml

@@ -27,9 +27,15 @@
                     {{language['产品编码']||'产品编码'}}：{{item.itemno}}
                 </view>
                 <view class="subfield line-1">
-                    <text>{{language['品牌']||'品牌'}}:{{language[item.brandname]||item.brandname}}</text>
-                    {{language['领域']||'领域'}}:{{language[item.tradefields]||item.tradefields}}
+                    <text>{{language['品牌']||'品牌'}}:{{language[item.brandname]||item.brandname||'--'}}</text>
+                    {{language['领域']||'领域'}}:{{language[item.tradefields]||item.tradefields||'--'}}
                 </view>
+                <view class="subfield line-1" wx:if="{{siteid=='HY'}}">
+                    <text>{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber||'--'}}</text>
+                    {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure||'--'}}
+                </view>
+
+
                 <view class="price line-1">
                     {{language['价格']||'价格'}}：<text class="num">{{item.newPrice}}{{language['元']||'元'}}</text><text wx:if="{{item.oldPrice}}" style="text-decoration:line-through; color:#999;">/{{item.oldPrice}}</text>
                 </view>
@@ -37,7 +43,7 @@
         </view>
         <view class="bot">
             <text style="padding-left:0;" class="line-1">{{language['型号']||'型号'}}:{{language[item.model]||item.model||' --'}}</text>
-            <text class="line-1">{{language['规格']||'规格'}}:{{language[item.spec]||item.spec||' --'}}</text>
+            <text class="line-1" wx:if="{{siteid!='HY'}}">{{language['规格']||'规格'}}:{{language[item.spec]||item.spec||' --'}}</text>
         </view>
     </navigator>
     <view wx:if="{{!radio}}" style="height: 130rpx;" />