Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/detail.vue

@@ -138,8 +138,10 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="storeVersion == 1 && goods.merchant_id > 0 && goods.merchant" class="merchant-info" @click="toShop()">
-			<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill"></image>
+		<view v-if="storeVersion == 1 && goods.merchant_id > 0 && goods.merchant" class="merchant-info"
+			@click="toShop()">
+			<image :src="goods.merchant.logoImage && goods.merchant.logoImage[0].external_url" mode="aspectFill">
+			</image>
 			<view class="info-box">
 				<view class="info-name">
 					<text>{{ goods.merchant.shop_name }}</text>
@@ -213,6 +215,14 @@
 					<text class="li" style="margin-right: 5rpx;">全程跟踪</text>
 				</view>
 			</view>
+			<view class="chosed" v-if="goods.remark">
+				<view class="title">须知</view>
+				<view class="info">
+					<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'>
+						<rich-text :nodes="goods.remark"></rich-text>
+					</u-read-more>
+				</view>
+			</view>
 		</view>
 		<!-- 		<view class="about">
 			<view class="aboutHead">
@@ -407,7 +417,7 @@
 			</view>
 			<view class="shareWechat" v-if="shareType=='share'">
 				<view class="shareGoods">
-					<image :src="goods.goods_image"  class="shareImg">
+					<image :src="goods.goods_image" class="shareImg">
 					</image>
 				</view>
 				<view class="shareInfo">
@@ -600,7 +610,6 @@
 				this.isLogin = false;
 				this.userInfo = {}
 			}
-			console.log(this.userInfo)
 		},
 		onPageScroll(e) {
 			if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true
@@ -1663,41 +1672,47 @@
 			}
 		}
 	}
-	
+
 	.merchant-info {
 		margin: 20rpx 18rpx 0 18rpx;
 		padding: 30rpx;
 		background: #fff;
 		display: flex;
+
 		>image {
 			width: 90rpx;
 			height: 90rpx;
 			margin-right: 20rpx;
 			flex-shrink: 0;
 		}
+
 		.info-box {
 			width: calc(100% - 110rpx);
 			display: flex;
 			flex-direction: column;
 			justify-content: space-between;
+
 			>.info-name {
 				font-size: 30rpx;
 				color: #333;
 				font-weight: bold;
 				display: flex;
 				align-items: center;
+
 				>text {
 					overflow: hidden;
 					text-overflow: ellipsis;
 					white-space: nowrap;
 					width: calc(100% - 21rpx);
 				}
+
 				>image {
 					margin-left: 10rpx;
 					width: 13rpx;
 					height: 24rpx;
 				}
 			}
+
 			>.label {
 				text {
 					display: inline-block;
@@ -1713,7 +1728,7 @@
 			}
 		}
 	}
-	
+
 	.orderInfo {
 		// width: 720rpx;
 		background: #FFFFFF;

pages/goods/seckillDetail.vue

@@ -188,6 +188,14 @@
 					<text class="li" style="margin-right: 5rpx;">全程跟踪</text>
 				</view>
 			</view>
+			<view class="chosed" v-if="goods.remark">
+				<view class="title">须知</view>
+				<view class="info">
+					<u-read-more :toggle="true" font-size='24' text-indent='0' show-height="200" open-text='收起' close-text='展开'>
+						<rich-text :nodes="goods.remark"></rich-text>
+					</u-read-more>
+				</view>
+			</view>
 		</view>
 		<view class="detail-content" @click="onLook(goods.isLink,goods.contentLink)" v-if="goods.isLink"
 			v-html="goods.content"></view>