Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages.json

@@ -763,11 +763,14 @@
 					"path": "signListEdit" //活动报名人员修改
 				},
 				{
-					"path": "brand/detail_new" //品牌详情-新版
+					"path": "brand/detail_new" ,//品牌详情-新版
+					"enablePullDownRefresh": false
 				},{
-					"path": "brand/detail_brand" //品牌详情-新版
+					"path": "brand/detail_brand" ,//品牌详情-新版
+					"enablePullDownRefresh": false
 				},{
-					"path": "brand/detail_company" //品牌详情-新版
+					"path": "brand/detail_company" ,//品牌详情-新版
+					"enablePullDownRefresh": false
 				},{
 					"path": "carrier/detail_carrier", //新载体详情
 					"enablePullDownRefresh": true,

pages/kotra/carrier/detail_building.vue

@@ -276,7 +276,7 @@
               <text style="width: 156rpx; text-align: right">投运时间：</text>
               <text
                 :style="{color:mainColor}" style="font-weight: bold"
-                >{{ detailData.OperationTime }}㎡</text
+                >{{ detailData.OperationTime }}</text
               >
             </view>
           </view>