|  | @@ -52,7 +52,7 @@ $(function () {
 | 
	
		
			
				|  |  |      $("#jqGrid").jqGrid("setFrozenColumns");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      var marketing =
 | 
	
		
			
				|  |  | -        {'lscx': '临时促销',/*'yhq': '优惠券',*/'rchd': '日常活动','mysy': '买N送一',/*'mj': '满减', 'mz': '满赠','dz': '打折','zhjsp': '组合价商品',*/'drjbj':'第二件半价'};
 | 
	
		
			
				|  |  | +        {'lscx': '临时促销','jfdk': '积分抵扣'/*'yhq': '优惠券','rchd': '日常活动','mysy': '买N送一',/*'mj': '满减', 'mz': '满赠','dz': '打折','zhjsp': '组合价商品','drjbj':'第二件半价'*/};
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      let mkCode = getQueryString("mkCode");
 | 
	
	
		
			
				|  | @@ -93,6 +93,8 @@ $(function () {
 | 
	
		
			
				|  |  |                          mkaTopicName = marketing.zhjsp;
 | 
	
		
			
				|  |  |                      else if(value === 'drjbj')
 | 
	
		
			
				|  |  |                          mkaTopicName = marketing.drjbj;
 | 
	
		
			
				|  |  | +                    else if(value === 'jfdk')
 | 
	
		
			
				|  |  | +                        mkaTopicName = marketing.jfdk;
 | 
	
		
			
				|  |  |                      return mkaTopicName == null? value : mkaTopicName;
 | 
	
		
			
				|  |  |                  }},
 | 
	
		
			
				|  |  |              {label: '商户名称', name: 'merchName', width: 200, align: 'center'},
 |