Merge branch '蓝色' into 测试

packageA/contract/modules/discount/product/list/index.wxml

@@ -24,7 +24,7 @@
                 </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>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['牌价']||'牌价'}}:{{item.showMarketprice||' --'}}</text>
@@ -48,4 +48,5 @@
         </view>
     </view>
 </view>
-<My_empty wx:if="{{list.length==0}}" />
+<My_empty wx:if="{{list.length==0}}" />
+<wxs src="../../../../../../utils/nominalpressure.wxs" module="join"></wxs>

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

@@ -24,7 +24,7 @@
                 </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>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['牌价']||'牌价'}}:{{item.showMarketprice||' --'}}</text>
@@ -63,4 +63,5 @@
         </view>
     </view>
 </view>
-<My_empty wx:if="{{list.length==0}}" />
+<My_empty wx:if="{{list.length==0}}" />
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

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

@@ -24,7 +24,7 @@
                 </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>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}：{{join.formatting(item.nominalpressure)}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['牌价']||'牌价'}}：{{item.showMarketprice||' --'}}</text>
@@ -62,4 +62,5 @@
         </view>
     </view>
 </view>
-<My_empty wx:if="{{list.length==0}}" />
+<My_empty wx:if="{{list.length==0}}" />
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

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

@@ -24,7 +24,7 @@
                 </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>
+                    <text class="line-1">{{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}</text>
                 </view>
                 <view class="subfield">
                     <text class="line-1" style="margin-right: 6rpx;">{{language['牌价']||'牌价'}}:{{item.marketprice||' --'}}</text>
@@ -51,4 +51,5 @@
         </view>
     </view>
 </view>
-<My_empty wx:if="{{list.length==0}}" />
+<My_empty wx:if="{{list.length==0}}" />
+<wxs src="../../../../../utils/nominalpressure.wxs" module="join"></wxs>

packageA/select/product/select.wxml

@@ -29,7 +29,7 @@
                 </view>
                 <view class="subfield line-1" wx:if="{{siteid=='HY'}}">
                     <text>{{language['公称通径']||'公称通径'}}:{{language[item.caliber]||item.caliber|| ' --'}}</text>
-                    {{language['公称压力']||'公称压力'}}:{{language[item.nominalpressure]||item.nominalpressure|| ' --'}}
+                    {{language['公称压力']||'公称压力'}}:{{join.formatting(item.nominalpressure)}}
                 </view>
                 <view class="subfield line-1">
                     <text>{{language['标准']||'标准'}}:{{language[item.standards]||item.standards|| ' --'}}</text>
@@ -74,4 +74,5 @@
     </wxs>
 </block>
 
-<Yl_Filtrate1 show='{{filtrate}}' list="{{filtratelist}}" bindhandle="handleFilter" bindinterrupt='interrupt' />
+<Yl_Filtrate1 show='{{filtrate}}' list="{{filtratelist}}" bindhandle="handleFilter" bindinterrupt='interrupt' />
+<wxs src="../../../utils/nominalpressure.wxs" module="join"></wxs>

utils/nominalpressure.wxs

@@ -0,0 +1,4 @@
+module.exports.formatting = function formatting(list) {
+    if (list.length == 0) return '--';
+    return list.join('/');
+};