Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  视频

pages/shop/goodsDetail.vue

@@ -4,7 +4,8 @@
 		<swiper class="swiper" circular  :autoplay="false" :indicator-dots="true" indicator-color="#CCCCCC" indicator-active-color="#D53533">
 			<swiper-item v-for="(item,index) in info.ImgList">
 				<view class="swiper-item">
-					<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg">
+					<img mode="aspectFit" :src="item.url" alt="" class="swiper-itemImg" v-if="item.bizType==1">
+					<video :src="item.url" v-if="item.bizType==2" show-fullscreen-btn controls style="width: 100%;height: 100%;"></video>
 				</view>
 			</swiper-item>