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

node_modules/uview-ui/components/u-tabs/u-tabs.vue

@@ -199,7 +199,7 @@
 					let style = {
 						height: this.height + 'rpx',
 						// 'line-height': this.height + 'rpx',
-						fontSize: this.fontSize + 'rpx',
+						fontSize: this.fontSize + 'rpx !important',
 						'transition-duration': `${this.duration}s`,
 						padding: this.isScroll ? `0 ${this.gutter}rpx` : '',
 						flex: this.isScroll ? 'auto' : '1'
@@ -207,7 +207,7 @@
 					// 字体加粗
 					if (index == this.currentIndex && this.bold) style.fontWeight = 'bold';
 					if (index == this.currentIndex) {
-						style.fontSize=this.activeFontSize+ 'rpx'
+						style.fontSize=this.activeFontSize+ 'rpx !important'
 						console.log(style.fontSize)
 						if(this.typeStyle!=2){
 							style.color = this.activeColor;

pages/kotra/brand/detail_company.vue

@@ -52,8 +52,8 @@
               </view>
             </view>
             <view class="baseinfo-item flex">
-              <view class="baseinfo-label"> 楼宇装修： </view>
-              <view class="baseinfo-con"> {{details.Renovation}} </view>
+              <view class="baseinfo-label"> 意向楼宇： </view>
+              <view class="baseinfo-con">{{details.ETypeName }} · {{details.Renovation}} </view>
             </view>
 			<view class="baseinfo-item flex">
 			  <view class="baseinfo-label"> 交房日期： </view>

pages/kotra/brand/list.vue

@@ -101,12 +101,13 @@
               :current="active"
               @change="changeHandler"
               :show-bar="false"
-              :activeFontSize="23"
+              :activeFontSize="28"
               :bold="true"
               height="45"
               duration="0"
-              font-size="23"
+              font-size="26"
               gutter="29"
+			  class="custom-tab-list"
             ></u-tabs>
         </view>
       </view>
@@ -699,4 +700,7 @@ export default {
   font-family: PingFang SC;
   font-weight: 500;
 }
+.custom-tab-list .u-tab-item {
+	line-height: 25px !important;
+}
 </style>

pages/kotra/carrier/detail_building.vue

@@ -280,6 +280,68 @@
               >
             </view>
           </view>
+		  <view
+		    style="
+		      display: flex;
+		      align-items: center;
+		      margin-bottom: 30rpx;
+		      font-weight: 500;
+		    "
+		  >
+		    <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
+		      <text style="width: 156rpx; text-align: right">建设时间：</text>
+		      <text
+		        :style="{color:mainColor}" style="font-weight: bold"
+		        >{{ detailData.ConstructionTime }}</text
+		      >
+		    </view>
+		    <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
+		      <text style="width: 156rpx; text-align: right">统一运营：</text>
+		      <text
+		        :style="{color:mainColor}" style="font-weight: bold"
+		        >{{ detailData.IsAllOperate==1?'是':'否' }}</text
+		      >
+		    </view>
+		  </view>
+		  <view
+		    style="
+		      display: flex;
+		      align-items: center;
+		      margin-bottom: 30rpx;
+		      font-weight: 500;
+		    "
+		  >
+		    <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
+		      <text style="width: 156rpx; text-align: right">物业费用：</text>
+		      <text
+		        :style="{color:mainColor}" style="font-weight: bold"
+		        >{{ detailData.PropertyFee }}/月/㎡</text
+		      >
+		    </view>
+		    <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
+		      <text style="width: 156rpx; text-align: right">每月租金：</text>
+		      <text
+		        :style="{color:mainColor}" style="font-weight: bold"
+		        >{{ detailData.RentFee }}/月/㎡</text
+		      >
+		    </view>
+		  </view>
+		  <!-- <view class="carrier-item-detail" v-if="detailData.Crowd!=''">
+		  	<div class="title">是否统一运营</div>
+		  			<div class="content">{{ detailData.IsAllOperate==1?'是':'否' }}</div>
+		  </view>
+		  <view class="carrier-item-detail" v-if="detailData.ConstructionTime!=''">
+		  	<div class="title">建设时间</div>
+		  			<div class="content">{{ detailData.ConstructionTime }}</div>
+		  </view>
+		  <view class="carrier-item-detail" v-if="detailData.PropertyFee!=''">
+		  	<div class="title">物业费</div>
+		  			<div class="content">{{ detailData.PropertyFee }}/月/㎡</div>
+		  </view>
+		  <view class="carrier-item-detail" v-if="detailData.RentFee!=''">
+		  	<div class="title">月租金</div>
+		  			<div class="content">{{ detailData.RentFee }}/月/㎡</div>
+		  </view> -->
 		 
           <view
             style="
@@ -390,22 +452,7 @@
 		  	<div class="title">目标招商业态</div>
 			<div class="content">{{ detailData.BrandDemand }}</div>
 		  </view>
-		  <view class="carrier-item-detail" v-if="detailData.Crowd!=''">
-		  	<div class="title">是否统一运营</div>
-			<div class="content">{{ detailData.IsAllOperate==1?'是':'否' }}</div>
-		  </view>
-		  <view class="carrier-item-detail" v-if="detailData.ConstructionTime!=''">
-		  	<div class="title">建设时间</div>
-			<div class="content">{{ detailData.ConstructionTime }}</div>
-		  </view>
-		  <view class="carrier-item-detail" v-if="detailData.PropertyFee!=''">
-		  	<div class="title">物业费</div>
-			<div class="content">{{ detailData.PropertyFee }}/月/㎡</div>
-		  </view>
-		  <view class="carrier-item-detail" v-if="detailData.RentFee!=''">
-		  	<div class="title">物业构成</div>
-			<div class="content">{{ detailData.RentFee }}/月/㎡</div>
-		  </view>
+		  
 		  <view class="carrier-item-detail" v-if="detailData.IndustryDirection!=''">
 		  	<div class="title">产业方向</div>
 			<div class="content">{{ detailData.IndustryDirection }}</div>

pages/kotra/carrier/detail_carrier.vue

@@ -227,9 +227,9 @@
               >
             </view>
 			<view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
-			  <text style="width: 156rpx; text-align: right">店铺数量：</text>
+			  <text style="width: 156rpx; text-align: right">开业时间：</text>
 			  <text :style="{color:mainColor}" style="font-weight: bold">{{
-			    detailData.ShopNum
+			    detailData.OpeningStatus==0?'即将开业':(detailData.OpenTime?detailData.OpenTime:'')
 			  }}</text>
 			</view>
           </view>
@@ -297,22 +297,6 @@
               >
             </view>
           </view>
-		  <view
-		    style="
-		      display: flex;
-		      align-items: center;
-		      margin-bottom: 30rpx;
-		      font-weight: 500;
-		    "
-		  >
-		    <view style="flex: 1; font-size: 26rpx; color: #a4a4a4">
-		      <text style="width: 156rpx; text-align: right">开业时间：</text>
-		      <text :style="{color:mainColor}" style="font-weight: bold">{{
-		        detailData.OpeningStatus==0?'即将开业':(detailData.OpenTime?detailData.OpenTime:'')
-		      }}</text>
-		    </view>
-		  
-		  </view>
           <view
             style="
               font-size: 26rpx;

pages/kotra/carrier/list.vue

@@ -59,7 +59,7 @@
               :bold="true"
               height="100"
               duration="0"
-              font-size="28"
+              :font-size="28"
             ></u-tabs>
           </view>
           <!-- <div style="width: 60rpx" @click="showPopup = true">
@@ -110,11 +110,11 @@
               :current="active"
               @change="changeHandler"
               :show-bar="false"
-              :activeFontSize="23"
+              :activeFontSize="28"
               :bold="true"
               height="45"
               duration="0"
-              font-size="23"
+              :font-size="26"
               gutter="29"
             ></u-tabs>
         </view>