Merge branch 'dev4.6.1.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.1.2

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -242,7 +242,6 @@
                 //订单条件
                 if (r.data.order.filter) {
                     var filterObj = JSON.parse(r.data.order.filter);
-                    filterObj.badge = '202111'
                     // 活动角标
                     if (filterObj.badge) {
                         $(".order-img").addClass('badge-' + filterObj.badge)