Merge branch 'master' of http://39.105.58.247:3100/yidiandao/ydd_front

mer_uniapp/pages/merchant/home/index.vue

@@ -36,7 +36,7 @@
 						</view>
 						
 						<!-- 提示 -->
-						<view v-if="merchanInfo.headline.length" class="store-tip flex-y-center mt-10 mb-10 pl-32">
+						<view v-if="merchanInfo.headline && merchanInfo.headline.length" class="store-tip flex-y-center mt-10 mb-10 pl-32">
 							<!-- 左侧固定图片 -->
 							<text class='iconfont icon-laba ' style="font-size: 24rpx;margin-right: 20rpx;"></text>
 						

mer_uniapp/pages/substitute_fast_mail/home/index.vue

@@ -32,9 +32,9 @@
 		<navigator url="/pages/address/user_address_list/index">
 			<view class="fast-top flex-between-center">
 				<view>
-					<view>送至：{{addressItem.province}}{{addressItem.city}}{{addressItem.district}}{{addressItem.street}}{{addressItem.detail}}</view>
+					<view>送至：{{addressItem.province || ''}}{{addressItem.city || ''}}{{addressItem.district || ''}}{{addressItem.street || ''}}{{addressItem.detail || ''}}</view>
 					<view style="margin-top: 10rpx;">
-						<text>{{addressItem.realName}}</text> 收 {{addressItem.phone}}
+						<text>{{addressItem.realName || ''}}</text> 收 {{addressItem.phone || ''}}
 					</view>
 				</view>
 				<view>
@@ -240,7 +240,7 @@
 						return { ...item
 						}
 					}) || []
-					console.log(this.fastMailData)
+					console.log(this.fastMailData,'fastMailData')
 					this.orderPrice = +res.data.payFee
 				})
 			},