Merge pull request '写死首页拼团推荐的头像' (#236) from zhy into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/236

components/shop/list/index.vue

@@ -2,7 +2,6 @@
     <view class="list">
         <view class="top">商品推荐</view>
 		<view>
-			<!-- <u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper> -->
 			<u-tabs :list="classifyList" name="gc_name" :is-scroll="true" :current="current" @change="tabsChange" active-color="#FF780F" :show-bar="false" height="60" font-size="24"  inactive-color="#333333"></u-tabs>
 		</view>
 		<swiper class="swiper-box" :current="swiperCurrent" @animationfinish="animationfinish" :style="{height: swiperHeight}">
@@ -49,7 +48,7 @@ export default {
 		this.getGoodsClassRecommend();
 	},
 	methods: {
-		loadMore(page) {
+		loadMore() {
 			if(!this.timer) return false;
 			this.loadStatus = "loading";
 			this.page++;
@@ -85,8 +84,6 @@ export default {
 				page: page,
 				gc_id: gc_id,
 			})
-				console.log(res)
-
 			// this.swiperCurrent = this.current;
 			if (res.errCode == 0) {
 				this.timer = true;

components/shop/recommend/pintuan.vue

@@ -10,7 +10,7 @@
         <view class="connect">
             <view class="user">
                 <view class="avatar">
-					<image :src="info.member_avatar[0]"></image>
+					<image src="/static/image/common/32.png"></image>
 					<image src="/static/image/common/31.png"></image>
 				</view>
 				<view class="num">{{ info.pintuan_limit_number }}人团</view>

pageE/mine/MineConcerns.vue

@@ -128,6 +128,7 @@ export default {
 			overflow: hidden;
 			margin-left: 20rpx;
 			margin-bottom: 20rpx;
+			box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
 			.head{
 				width: 80rpx;
 				height: 80rpx;

pageE/more/Complaints.vue

@@ -46,7 +46,7 @@ export default {
 			})
 		},
 		previewImage(urls) {
-			console.log(urls);
+			// console.log(urls);
 			uni.previewImage({
 				urls: urls,
 			});

pages/shop/index.vue

@@ -257,11 +257,10 @@
 </script>
 <style lang="scss" scoped>
 	.shop {
-		height: calc(100% - var(--window-top));
+		height: calc(100vh - var(--window-top));
 		box-sizing: border-box;
 		background-color: #F0EDF1;
         overflow-y: scroll;
-
 		.top {
 			padding: 0 30rpx;
 			background-color: #ffffff;