Merge remote-tracking branch 'remotes/origin/dev' into ats

pages/user/historyDetail.vue

@@ -46,7 +46,7 @@
 
 
 			</view>
-
+           
 			<!-- 店铺信息 -->
 			<view class="shopBox">
 				<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>