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

pages/home/index.vue

@@ -1,12 +1,15 @@
 <template>
 	<mobile-frame :frameStyle="frameStyle" @toPath="toPath">
-		<scroll-view class="scrollView" scroll-with-animation :scroll-into-view="topItem" scroll-y="true" @scroll="handleScroll">
+		<scroll-view class="scrollView" scroll-with-animation :scroll-into-view="topItem" scroll-y="true"
+			@scroll="handleScroll">
 			<view class="main" id="top">
 				<view class="zero one">
-					<input type="text" placeholder="搜索商品" @tap="toCommon('pagesHome/market/search')" placeholder-class="placss">
+					<input type="text" placeholder="搜索商品" @tap="toCommon('pagesHome/market/search')"
+						placeholder-class="placss">
 				</view>
 				<view class="zero two">
-					<swiper class="swiper" circular :indicator-dots="true" indicator-color="#ffffff" indicator-active-color="#FB1438" :autoplay="true" :interval="3000" :duration="1000">
+					<swiper class="swiper" circular :indicator-dots="true" indicator-color="#ffffff"
+						indicator-active-color="#FB1438" :autoplay="true" :interval="3000" :duration="1000">
 						<swiper-item class="list" v-for="(item,index) in bannerList" :key="index">
 							<image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode=""></image>
 						</swiper-item>
@@ -280,9 +283,9 @@
 				margin: 0 0 2vw 0;
 
 				.image {
-					width: 100%;
-					height: 16vw;
-					margin: 0 0 1vw 0;
+					width: 80%;
+					height: 13vw;
+					margin: 1.5vw 0 1.5vw 0;
 				}
 
 				.name {

pages/market/index.vue

@@ -38,6 +38,7 @@
 								<view class="list">
 									<view class="title">
 										<checkbox :value="item.id" :checked="item.check">
+											<text class="iconfont icon-shangdian"></text>
 											{{item.title}}
 										</checkbox>
 									</view>
@@ -48,6 +49,7 @@
 											</view>
 											<view class="img">
 												<image src="../../static/logo.png"></image>
+												<!-- <image class="image" :src="item.url&&item.url.length>0?item.url[0].url:''" mode=""></image> -->
 											</view>
 											<view class=" one_1" v-if="num==0">
 												<view class="name">{{item.name}}</view>
@@ -136,8 +138,7 @@
 				totalMoney: 0,
 			};
 		},
-		onShow: function() {
-		},
+		onShow: function() {},
 		methods: {
 			toPath(e) {
 				if (e && e.route) uni.redirectTo({
@@ -402,6 +403,9 @@
 					border-bottom: 1px solid var(--fcColor);
 					padding: 0 0 2vw 0;
 					font-size: var(--font18Size);
+					text{
+						margin: 0 1vw;
+					}
 				}
 
 				.content {