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

pages/blindDate/postbar.vue

@@ -97,7 +97,12 @@
 	 
     </view>
 	<view class="release"  @click.stop="gopublishing()">
-		<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image>
+		<!-- <image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pp-fabu.png" style="width: 100%;height: 100%;"></image> -->
+		<!-- 发布动态按钮 -->
+		<view class="fbanniu">
+			<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/fabupyq.png" style="height: 26rpx;" mode="aspectFit"></image>
+			<text style="font-size: 10px;color: #FFF;">发布</text>
+		</view>
 	</view>
     <!-- 加载中 -->
     <view class="loading" v-if="loading">
@@ -379,4 +384,18 @@ export default {
 	align-items: center;
 	margin-top: 10px;
 }
+.fbanniu{
+		width: 42px;
+		height: 42px;
+		border-radius: 21px;
+		position: fixed;
+		right: 20rpx;
+		bottom: 170rpx;
+		background: #40766E;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		z-index: 99;
+	}
 </style>

pages/kotra/carrier/detail.vue

@@ -93,7 +93,8 @@
 					</view>
 					<view style="font-size: 26rpx;color:#a4a4a4;margin-bottom: 30rpx;font-weight: 500;">
 						<text style="width: 156rpx;text-align: right;">地铁站点：</text>
-						<text style="color:#1F1F1F;font-weight: bold;" v-if="detailData.CarrierMetroList">{{detailData.CarrierMetroList[0].MetroNum}}号线{{detailData.CarrierMetroList[0].MetroName}},&nbsp;{{detailData.CarrierMetroList[0].Distance}}</text>
+						<text style="color:#1F1F1F;font-weight: bold;" v-if="detailData.CarrierMetroList!=null">{{detailData.CarrierMetroList[0].MetroNum}}号线{{detailData.CarrierMetroList[0].MetroName}},&nbsp;{{detailData.CarrierMetroList[0].Distance}}</text>
+						<text style="color:#1F1F1F;font-weight: bold;" v-if="detailData.CarrierMetroList==null">暂无地铁新线</text>
 					</view>
 					<view style="display: flex;align-items: center;">
 						<view