Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

pagesGood/liveDetail.nvue

@@ -106,6 +106,13 @@
 
 			this.init();
 		},
+		beforeCreate() {
+		  let domModule = weex.requireModule('dom');
+		  domModule.addRule('fontFace',{
+			'fontFamily': "nvueIconfont",
+			'src': "url('https://at.alicdn.com/t/font_2119167_43jbldmjpr3.ttf')"
+		  })
+		},
 		onUnload() {
 			this.exitRoom();
 		},

pagesGood/pickVideo.nvue

@@ -13,7 +13,25 @@
             <text class="popup-close-text" @click="$refs.popup.close()">收起</text>
           </view>
           <scroll-view scroll-y="true" class="good-box">
-            
+            <view class="goods-row" v-for="(item, index) in goodsList" :key="index">
+				<view class="goods-img-box">
+					<image class="goods-img" :src="item.imgPath" mode="aspectFill"></image>
+				</view>
+				<view class="goods-info">
+					<view>
+						<text class="goods-name">{{item.productName}}</text>
+					</view>
+					<text class="goods-sales">{{item.sellCount ? item.sellCount : 0}}人付款</text>
+					<text class="price">原价:{{item.originalPrice}}</text>
+					<view class="goods-number-bottom">
+						<view class="goods-number">
+							<!-- <text class="goods-number-left">惊爆价:</text> -->
+							<text class="goods-icon">￥</text>
+							<text class="goods-spec">{{item.bizPrice}}</text>
+						</view>
+					</view>
+				</view>
+            </view>
           </scroll-view>
         </view>
       </uni-popup>
@@ -158,4 +176,111 @@
   font-family: PingFang SC;
   text-align: left;
 }
+
+.good-box {
+	width: 750rpx;
+	height: 230px;
+	padding: 0 0 10px 0;
+	overflow: visible;
+}
+
+.goods-row:first-child {
+	margin-top: 12px;
+}
+
+.goods-row {
+	width: 700rpx;
+	height: 104px;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	background-color: #FFFFFF;
+	box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.1);
+	border-radius: 5px;
+	margin: 0 15px 10px 15px;
+}
+
+.goods-img-box {
+	margin-right: 15px;
+}
+
+.goods-img {
+	width: 104px;
+	height: 104px;
+	object-fit: cover;
+}
+
+.goods-info {
+	flex: 1;
+	padding-top: 10px;
+}
+
+.goods-name {
+	line-height: 15px;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	word-wrap: break-word;
+	text-overflow: ellipsis;
+	font-size: 15px;
+	font-family: PingFang SC;
+	color: #333333;
+}
+
+.goods-sales {
+	font-size: 12px;
+	font-family: PingFang SC;
+	color: #666666;
+	line-height: 15px;
+	margin: 8px 0 8px 0;
+}
+
+.price {
+	font-size: 12px;
+	text-decoration: line-through;
+	color: #A67954;
+}
+
+.goods-number-bottom {
+	display: flex;
+	flex-direction: row;
+}
+
+.goods-number {
+	display: flex;
+	flex-direction: row;
+	white-space: nowrap;
+	line-height: 24px;
+}
+
+.goods-number-left {
+	font-size: 12px;
+	color: #666666;
+}
+
+.goods-icon {
+	font-size: 14px;
+	font-family: PingFang SC;
+	color: #52A63A;
+}
+
+.goods-spec {
+	font-size: 24px;
+	font-family: PingFang SC;
+	color: #52A63A;
+}
+
+.more-button {
+	width: 24px;
+	height: 24px;
+	position: absolute;
+	right: 16px;
+}
+
+.more-button-iconfont {
+	font-size: 36px;
+	color: #999999;
+	text-align: center;
+}
 </style>

pagesMain/orderItem.vue

@@ -113,7 +113,7 @@
 				goodType: ''
 			}
 		},
-		onReady() {
+		mounted() {
 			this.pickHandle = this.orderData.products.filter(site => site.productType == 3).length > 0
 			this.sharePlant = this.orderData.products.filter(site => site.productType == 4).length > 0
 			this.goodType = this.pickHandle ? 3 : ''
@@ -197,6 +197,7 @@
 					})
 				} else if (type == 4) {
 					//  自助采摘
+					// #ifdef MP-WEIXIN
 					var that=this;
 					if(uni.getStorageSync("firstTimeLiveUser")==""){
 						uni.setStorage({
@@ -224,6 +225,12 @@
 					}
 					
 					return false;
+					// #endif
+					// #ifdef APP-PLUS
+					uni.navigateTo({
+						url: '/pagesGood/pickVideo?orderId=' + this.orderData.orderId + '&tenantCode=' + this.orderData.tenantCode
+					});
+					// #endif
 				} else if (type == 6) {
 					//  追踪物流
 					uni.navigateTo({