Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/point-app

pagesHome/farming/index.vue

@@ -9,8 +9,7 @@
 					<view class="second">
 						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage">
 							<view class="list-scroll-view">
-								<view class="list" v-for="(item,index) in list" :key="index"
-									@tap="toCommon('pagesHome/order/detail')">
+								<view class="list" v-for="(item,index) in list" :key="index" @tap="toCommon('pagesHome/order/detail')">
 									<image class="image" :src="item.url" mode=""></image>
 									<view class="name">
 										{{item.name}}
@@ -56,7 +55,12 @@
 							</view>
 						</view>
 						<view class="second_2">
-							<image class="image" :src="info.url" mode=""></image>
+							<view class="second_2_bor">
+								<image class="image" :src="info.url" mode=""></image>
+							</view>
+							<view class="txt">
+								店铺二维码
+							</view>
 						</view>
 					</view>
 					<view class="collect">
@@ -302,7 +306,25 @@
 					.second_2 {
 						display: flex;
 						justify-content: center;
-						margin: 20vw 0 0 0;
+						flex-direction: column;
+						margin: 15vw 25vw 0 25vw;
+						text-align: center;
+						background: #b2b2b2;
+						padding: 2vw;
+						border-radius: 5px;
+
+						.second_2_bor {
+							.image {
+								width: 100%;
+								height: 40vw;
+							}
+						}
+
+						.txt {
+							color: #fff;
+							font-size: 14px;
+							margin: 2vw 0;
+						}
 					}
 				}
 			}