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

pages/store/index.vue

@@ -24,7 +24,7 @@
 								</view>
 							</view>
 							<view class="list_2">
-								<view class="market" v-for="(tag,indexs) in item.market" :key="indexs" @tap="toBuy(tag)">
+								<view class="market" v-for="(tag,indexs) in item.market" :key="indexs" @tap.stop="toBuy(tag)">
 									<image class="image" :src="tag.file&&tag.file.length>0?tag.file[0].url:''" mode=""></image>
 									<view class="money">
 										¥{{tag.sell_money}}