Merge branch 'master' of http://8.140.253.224:3000/root/school_uni

# Conflicts:
#	package1/group/groupBuySingle.vue

package1/group/groupBuySingle.vue

@@ -16,25 +16,25 @@
 			<view class="pintuan">
 				<view class="shop-top">
 					<view class="shop-img">
-						<img src="/static/images/img/shangpintu.png" alt="">
+						<img :src="shopItem.shopIcon" alt="">
 						<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/6c4ab92a43c842d8bb22035bce1f65cc.png"
 							alt=""
 							style="width:30rpx;height:30rpx;position: absolute;top: 0;left: 0;background-size: 100%;" />
 					</view>
 					<view class="shop-content" @tap="goDetail('shopDetail')">
 						<view class="shop-name">
-							牛仔农庄(医专店)
+							{{shopItem.shopName}}
 						</view>
 						<view class="shop-content-center">
 							<view class="shop-rate">
-								<view class="shop-rate-num">4.3</view>
+								<view class="shop-rate-num">{{shopItem.shopScore}}</view>
 								<uni-rate :disabled="true" size="20" disabledColor="rgba(255, 184, 84, 1)"
-									:value="4.3" />
+									:value="shopItem.shopScore" />
 							</view>
 							<view class="shop-tag">
 								<text
 									style="padding: 4rpx 10rpx;background: rgba(223, 255, 176, 1);color: #777;border-radius: 6rpx;">
-									炒菜
+									{{shopItem.shopTypeTitle}}
 								</text>
 							</view>
 						</view>
@@ -43,13 +43,13 @@
 								店铺评价<uni-icons type="right" size="12"></uni-icons>
 							</view>
 							<view class="shop-deal1">
-								月售 <text> 100+</text>
+								销量 <text> {{shopItem.saleCount != null ? shopItem.saleCount : 0}}</text>
 							</view>
 						</view>
 					</view>
 				</view>
 				<view class="shop-bottom">
-					公告：这里是第三食堂美食top1，好吃不贵，欢迎下好吃不贵，欢迎下单！欢迎下单！
+					公告：{{shopItem.remark}}
 				</view>
 			</view>
 			<view class="pintuan" style="padding: 0;margin-top:20rpx;display: flex;">
@@ -391,6 +391,11 @@
 	export default {
 		data() {
 			return {
+				type:'',
+				shopId:'',
+				shopItem:{},
+				productItem:{},
+				productId:'',
 				menuButtonInfo: {},
 				isPintuan:true,
 				menuList:[{
@@ -414,8 +419,14 @@
 		components: {
 
 		},
-		onLoad() {
+		onLoad(option) {
-
+			this.type = option.type
+			if(this.type == 'shop'){
+				this.shopItem = JSON.parse(option.item)
+			}else{
+				this.productItem = JSON.parse(option.item)
+			}
+			console.log(this.shopItem)
 		},
 		onShow() {
 			this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()