|  |  | @@ -29,7 +29,7 @@ | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | <!-- 一个商铺 --> | 
		
	
		
			
			|  |  |  | <!-- 多个商铺 --> | 
		
	
		
			
			|  |  |  | <view class='merchant-shop'> | 
		
	
		
			
			|  |  |  | <view class='merchant-shop shopHr'> | 
		
	
		
			
			|  |  |  | <view class='clearfix' style='width:100%;'> | 
		
	
		
			
			|  |  |  | <view class='fl'> | 
		
	
		
			
			|  |  |  | <text>商户位置:</text> | 
		
	
	
		
			
				|  |  | @@ -42,7 +42,7 @@ | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | <!-- 联系方式 --> | 
		
	
		
			
			|  |  |  | <view class='merchant-shop'  wx:if="{{data.linkLinePhone}}"> | 
		
	
		
			
			|  |  |  | <view class='merchant-shop shopHr'  wx:if="{{data.linkLinePhone}}"> | 
		
	
		
			
			|  |  |  | <view class='clearfix' style='width:100%;'> | 
		
	
		
			
			|  |  |  | <view class='fl'> | 
		
	
		
			
			|  |  |  | <text>客服电话:</text> | 
		
	
	
		
			
				|  |  | @@ -57,7 +57,7 @@ | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | <!-- 商户活动 --> | 
		
	
		
			
			|  |  |  | <view class='merchant-shop' wx:if="{{data.actionDesc}}" > | 
		
	
		
			
			|  |  |  | <view class='merchant-shop shopHr' wx:if="{{data.actionDesc}}" > | 
		
	
		
			
			|  |  |  | <view class='notes'> | 
		
	
		
			
			|  |  |  | <view> | 
		
	
		
			
			|  |  |  | <text>商户活动</text> | 
		
	
	
		
			
				|  |  | @@ -97,10 +97,10 @@ | 
		
	
		
			
			|  |  |  | <view class='loadingtext' wx:if="{{loadingtext}}">{{loadingtext}}</view> | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | <!-- 商户简介 --> | 
		
	
		
			
			|  |  |  | <view wx:elif="{{currentTab==1}}"> | 
		
	
		
			
			|  |  |  | <image src="{{noMerchant}}" mode="widthFix"></image> | 
		
	
		
			
			|  |  |  | <view wx:elif="{{currentTab==1}}" > | 
		
	
		
			
			|  |  |  | <image src="{{noMerchant}}" wx:if="{{!data.introduction}}" mode="widthFix"></image> | 
		
	
		
			
			|  |  |  | <text wx:if="{{data.introduction}}">{{data.introduction}}</text> | 
		
	
		
			
			|  |  |  | <text wx:else>信息完善中,敬请期待~</text> | 
		
	
		
			
			|  |  |  | <text wx:if="{{!data.introduction}}">信息完善中,敬请期待~</text> | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | </view> | 
		
	
		
			
			|  |  |  | <view class='merchant-info'> | 
		
	
	
		
			
				|  |  | 
 |