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

mer_uniapp/components/discoverDetails/index.vue

@@ -46,7 +46,7 @@
 						<view class="noteTitle flex-between-center">
 							<view>{{noteDetails.title}}</view>
 							<view v-if="dazi && noteDetails.authorId !== uid && !noteDetails.userIsJoin" class="dazi-info" @tap="onJoin">加入</view>
-							<view v-if="dazi && noteDetails.authorId !== uid && noteDetails.userIsJoin" class="dazi-info" @tap="onJoinColse">取消</view>
+							<view v-if="dazi && noteDetails.authorId !== uid && noteDetails.userIsJoin" class="dazi-info dazi-cancel" @tap="onJoinColse">取消</view>
 						</view>
 						<view>
 							<view class="text" v-if="noteDetails.isMore || (noteDetails.content && noteDetails.content.length<=70)">
@@ -553,15 +553,25 @@
 				this.$refs.joinDialog.open()
 			},
 			onJoinColse() {
-				myGameJoinIdApi(this.noteDetails.id).then(res => {
-					that.$util.Tips({
-						title: '取消成功'
-					});
-				}).catch(err => {
-					uni.showToast({
-						title: err,
-						icon: 'none'
-					})
+				let that = this;
+				uni.showModal({
+					content: '确定要取消么？',
+					success: function(res) {
+						if (res.confirm) {
+							myGameJoinIdApi(that.noteDetails.id).then(res => {
+								that.$util.Tips({
+									title: '取消成功'
+								});
+							}).catch(err => {
+								uni.showToast({
+									title: err,
+									icon: 'none'
+								})
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
 				});
 			},
 			handleInputClose() {
@@ -1089,6 +1099,10 @@
 		padding: 6rpx 25rpx;
 		border-radius: 8rpx;
 	}
+	.dazi-cancel {
+		background: #F8F9FB !important;
+		color: #141414 !important;
+	}
 
 	.tui-modal-custom {
 		width: 600rpx;

mer_uniapp/components/discoverFlowItem/discoverFlowItem.vue

@@ -15,7 +15,8 @@
 					<view v-else class="flex-col flex-between-center h-136" style="align-items: flex-start;padding: 15rpx; 0">
 						<view class="w-full info-dzi fs-26 flex-between-center">
 							<text style="font-weight: bold;">{{items.title || ''}}</text>
-							<view class="dazi-info" v-if="fromTo !== 'home'">加入</view>
+							<view class="dazi-info" v-if="fromTo !== 'home' && !items.userIsJoin">加入</view>
+							<view class="dazi-info dazi-cancel" v-if="fromTo !== 'home' && items.userIsJoin">取消</view>
 						</view>
 						<view class="info-xzi-jj">{{items.content || ''}}</view>
 					</view>
@@ -306,6 +307,11 @@
 		border-radius: 8rpx;
 	}
 	
+	.dazi-cancel {
+		background: #F8F9FB !important;
+		color: #141414 !important;
+	}
+	
 	.type-image {
 		width: 58rpx;
 		height: 58rpx;

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
 				})
 			},