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

pagesGood/goodList.vue

@@ -9,7 +9,7 @@
 				<u-divider color="#909399" border-color="#909399">没有更多了</u-divider>
 			</view>
 			<view class="goods-row" v-for="(item, index) in goodsList" :key="index" @click="goToGoodDetails(item)">
-				<image class="goods-img" :src="item.imgPath"></image>
+				<image class="goods-img" :src="item.imgPath" mode="aspectFill"></image>
 				<view class="goods-info">
 					<view class="goods-name">{{item.productName}}</view>
 					<view class="goods-details" v-if="item.productType != 4">{{item.productDescribe}}</view>

pagesGood/pickVideo.vue

@@ -12,7 +12,7 @@
 			<view class="popup-box">
 				<view class="popup-close" @click="closeGoods()">收起</view>
 				<scroll-view scroll-y="true" class="good-box">
-					<view class="goods-row" v-for="(item, index) in goodsList" :key="index" @click="goToGoodDetails(item)">
+					<view class="goods-row" v-for="(item, index) in goodsList" :key="index">
 						<image class="goods-img" :src="item.imgPath" mode="aspectFill"></image>
 						<view class="goods-info">
 							<view class="goods-name">{{item.productName}}</view>
@@ -23,9 +23,9 @@
 								<text class="price">原价:{{item.originalPrice}}</text>
 							</view>
 						</view>
-						<view class="more-button">
+						<!-- <view class="more-button">
 							<view class="iconfont icongengduo"></view>
-						</view>
+						</view> -->
 					</view>
 				</scroll-view>
 			</view>
@@ -121,11 +121,11 @@
 			closeGoods() {
 				this.$refs.popup.close()
 			},
-			goToGoodDetails(item) {
-				uni.navigateTo({
-					url: '/pagesGood/goodDetails?goodId=' + item.productId
-				});
-			},
+			// goToGoodDetails(item) {
+			// 	uni.navigateTo({
+			// 		url: '/pagesGood/goodDetails?goodId=' + item.productId
+			// 	});
+			// },
 			setData,
 			enterRoom: function(params) {
 				params.template = params.template || '1v1';