付费优惠券还是原来的店铺券、券列表

@@ -88,8 +88,8 @@
 		<image src="{{sellerObj.seller_image}}" mode="heightFix" />
 		<image src="{{sellerObj.seller_image}}" mode="heightFix" />
 		<view class="info_right">
 		<view class="info_right">
 			<view class="font36r sellerName">{{sellerObj.sellername}}</view>
 			<view class="font36r sellerName">{{sellerObj.sellername}}</view>
-			<view class="font24r">{{sellerObj.cateStr}}</view>
-			<view class="font28r">{{sellerObj.real_address}}</view>
+			<view class="font24r" wx:if="{{sellerObj.cateStr}}">{{sellerObj.cateStr}}</view>
+			<view class="font28r" wx:if="{{sellerObj.real_address}}">{{sellerObj.real_address}}</view>
 		</view>
 		</view>
 	</view>
 	</view>
 	<view class="bottom_box">
 	<view class="bottom_box">

@@ -36,7 +36,13 @@ Page({
 					}else{
 					}else{
 						item.is_expire='1';
 						item.is_expire='1';
 					}
 					}
+                    if(item.is_type == '3'){
+                        item.status = '2';
+                        item.is_examine = '0';
+                    }
 				})
 				})
+                list.sort((a, b) => a.is_examine - b.is_examine);
+                list.sort((a, b) => a.is_expire - b.is_expire);
 				this.setData({
 				this.setData({
 					list,
 					list,
 					isShow:true,
 					isShow:true,
@@ -65,9 +71,18 @@ Page({
 	todetail(e) {
 	todetail(e) {
 		let item=e.currentTarget.dataset['item'];
 		let item=e.currentTarget.dataset['item'];
 		if(item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'){
 		if(item.is_examine=='0' && item.is_expire=='0' && item.is_examine=='0' && item.status!='4' && item.status!='5'){
-			wx.navigateTo({
-				url: '/pack-activity/pack/examineCertificate?id='+item.id,
-			})
+            // 免费券 扫商家的付款码 进行使用
+            if(item.is_type == '3'){
+                wx.scanCode({
+                    success: (res) => {
+                    }
+                })
+                return  
+            }else{
+                wx.navigateTo({
+                    url: '/pack-activity/pack/examineCertificate?id='+item.id,
+                })
+            }
 		}
 		}
 		if(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'){
 		if(item.is_examine=='1' && item.is_expire=='0' && item.status!='4' && item.status!='5' && item.is_comment!='1'){
 			wx.navigateTo({
 			wx.navigateTo({

@@ -6,7 +6,7 @@
 		<view wx:for="{{list}}" class="card bg-white">
 		<view wx:for="{{list}}" class="card bg-white">
 			<view class="flex-vl gray-font card-main" style="justify-content:space-between;">
 			<view class="flex-vl gray-font card-main" style="justify-content:space-between;">
 				<view class="seller-info flex-ll">
 				<view class="seller-info flex-ll">
-					<view class="smooth font-siny font32r" wx:if="{{item.recharge_name}}">{{item.recharge_name}}</view>
+					<view class="smooth font-siny font32r" wx:if="{{item.recharge_name || item.aname}}">{{item.recharge_name || item.aname}}</view>
 				</view>
 				</view>
 				<view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view>
 				<view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view>
 				<view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view>
 				<view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view>

@@ -54,7 +54,6 @@ Page({
             this.getSellerVersionFun(sid)
             this.getSellerVersionFun(sid)
         }
         }
         this.couponModal = this.selectComponent("#couponModal");
         this.couponModal = this.selectComponent("#couponModal");
-        this.couponModal.showModal()
     },
     },
     // 关闭优惠券弹框(更新已被领取数量)
     // 关闭优惠券弹框(更新已被领取数量)
     closeCouponModal() {
     closeCouponModal() {